summaryrefslogtreecommitdiffstats
path: root/luni
Commit message (Expand)AuthorAgeFilesLines
* am 5ef7aa7f: Merge "TimerTest cleanup"Brian Carlstrom2013-04-251-339/+147
|\
| * TimerTest cleanupBrian Carlstrom2013-04-251-339/+147
| * Only enforce the encrypted bit in the GPBF, and ignore other unsupported bits.William Luh2013-04-253-5/+15
* | am 2797d28f: Merge "Fix a bug in DatagramChannel.send."Elliott Hughes2013-04-251-0/+1
|\ \ | |/
| * Merge "Fix a bug in DatagramChannel.send."Elliott Hughes2013-04-251-0/+1
| |\
| | * Fix a bug in DatagramChannel.send.Elliott Hughes2013-04-241-0/+1
* | | am 729a2281: Merge "Do not set valueDecoded until after the value is decoded"Brian Carlstrom2013-04-241-2/+2
|\ \ \ | |/ /
| * | Merge "Do not set valueDecoded until after the value is decoded"Brian Carlstrom2013-04-251-2/+2
| |\ \ | | |/ | |/|
| | * Do not set valueDecoded until after the value is decodedBrian Carlstrom2013-04-241-2/+2
* | | am cf2377ac: Merge "Fix getLocalAddress on closed sockets."Elliott Hughes2013-04-246-38/+40
|\ \ \ | |/ /
| * | Fix getLocalAddress on closed sockets.Elliott Hughes2013-04-246-38/+40
* | | am 85b24cc6: Merge "Reads from /dev/urandom can\'t really block."Elliott Hughes2013-04-246-89/+57
|\ \ \ | |/ /
| * | Reads from /dev/urandom can't really block.Elliott Hughes2013-04-246-89/+57
* | | am 62669dfa: Merge "Simplify NativeBN error handling."Elliott Hughes2013-04-243-220/+193
|\ \ \ | |/ /
| * | Simplify NativeBN error handling.Elliott Hughes2013-04-243-220/+193
* | | am 8a69ec61: Merge "Fix BigDecimal.abs to preserve immutability."Elliott Hughes2013-04-242-9/+11
|\ \ \ | |/ /
| * | Merge "Fix BigDecimal.abs to preserve immutability."Elliott Hughes2013-04-242-9/+11
| |\ \ | | |/ | |/|
| | * Fix BigDecimal.abs to preserve immutability.Elliott Hughes2013-04-232-9/+11
* | | am ec568ac4: Merge "X509CertImpl: Remove reference to OpenSSLProvider"Kenny Root2013-04-241-17/+2
|\ \ \ | |/ /
| * | Merge "X509CertImpl: Remove reference to OpenSSLProvider"Kenny Root2013-04-241-17/+2
| |\ \
| | * | X509CertImpl: Remove reference to OpenSSLProviderKenny Root2013-04-231-17/+2
* | | | am a8abf674: Merge "Add kernel CAP_ constants to libcore.io.OsConstants."Alex Klyubin2013-04-232-0/+75
|\ \ \ \ | |/ / /
| * | | Merge "Add kernel CAP_ constants to libcore.io.OsConstants."Alex Klyubin2013-04-232-0/+75
| |\ \ \ | | |_|/ | |/| |
| | * | Add kernel CAP_ constants to libcore.io.OsConstants.Alex Klyubin2013-04-192-0/+75
* | | | am 5cba3af3: Merge "Tracking revert of external/bouncycastle DERT61String cha...Brian Carlstrom2013-04-231-5/+19
|\ \ \ \ | |/ / /
| * | | Tracking revert of external/bouncycastle DERT61String change 44021512997b337e...Brian Carlstrom2013-04-231-5/+19
| | |/ | |/|
* | | am 0451730f: Merge "More 64-bit fixes for libcore native code."Elliott Hughes2013-04-2210-128/+128
|\ \ \ | |/ /
| * | Merge "More 64-bit fixes for libcore native code."Elliott Hughes2013-04-2310-128/+128
| |\ \
| | * | More 64-bit fixes for libcore native code.Elliott Hughes2013-04-2210-128/+128
| | |/
* | | am 60d77a52: Merge "64-bit fixes for BigInteger."Elliott Hughes2013-04-223-462/+429
|\ \ \ | |/ /
| * | 64-bit fixes for BigInteger.Elliott Hughes2013-04-223-462/+429
| |/
* | am 32d4f90c: Rename AndroidKeyStoreProvider -> AndroidKeyStoreKenny Root2013-04-191-1/+1
|\ \
| * | Rename AndroidKeyStoreProvider -> AndroidKeyStoreKenny Root2013-04-181-1/+1
| * | Merge "Do not include bogus certs in final chain output" into jb-mr2-devBrian Carlstrom2013-04-172-1/+17
| |\ \
| | * | Do not include bogus certs in final chain outputBrian Carlstrom2013-04-162-1/+17
* | | | am 862a382a: Merge "Only enforce the encrypted bit in the GPBF, and ignore ot...William Luh2013-04-173-5/+15
|\ \ \ \ | |/ / /
| * | | Merge "Only enforce the encrypted bit in the GPBF, and ignore other unsupport...William Luh2013-04-173-5/+15
| |\ \ \
| | * | | Only enforce the encrypted bit in the GPBF, and ignore other unsupported bits.William Luh2013-04-173-5/+15
| | |/ /
| * | | Merge "Fix Hebrew/Indonesian/Yiddish plural rules." into jb-mr2-devElliott Hughes2013-04-172-2/+27
| |\ \ \
| | * | | Fix Hebrew/Indonesian/Yiddish plural rules.Elliott Hughes2013-04-162-2/+27
| | |/ /
* | | | am e29d26ec: Merge "NativeCrypto: fix EOF at beginning of stream" into jb-mr2...Kenny Root2013-04-172-5/+124
|\ \ \ \ | |/ / /
| * | | NativeCrypto: fix EOF at beginning of streamKenny Root2013-04-162-5/+124
| |/ /
| * | am 0ca50a3d: resolved conflicts for merge of 4b27762c to jb-mr1-dev-plus-aospElliott Hughes2013-04-151-1/+1
| |\ \
| | * \ resolved conflicts for merge of 4b27762c to jb-mr1-dev-plus-aospElliott Hughes2013-04-151-1/+1
| | |\ \
| | | * | Fix a z/Z mixup in the SimpleDateFormat documentation.Elliott Hughes2013-04-151-4/+4
* | | | | am 42425720: Merge "Fix Hebrew/Indonesian/Yiddish plural rules."Elliott Hughes2013-04-162-2/+27
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge "Fix Hebrew/Indonesian/Yiddish plural rules."Elliott Hughes2013-04-162-2/+27
| |\ \ \ \
| | * | | | Fix Hebrew/Indonesian/Yiddish plural rules.Elliott Hughes2013-04-162-2/+27
* | | | | | am 14f442d9: Merge "Do not include bogus certs in final chain output"Brian Carlstrom2013-04-162-1/+17
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Do not include bogus certs in final chain outputBrian Carlstrom2013-04-162-1/+17
| |/ / / /