summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connectLjava_net_Soc...Daniel Xie2015-06-080-0/+0
|\
| * am 7329657b: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ...Daniel Xie2015-06-081-0/+12
| |\
| | * Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-081-0/+12
| | |\
| | | * Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-041-0/+12
| | | |\
| | | | * Add exceptions for test_connectLjava_net_SocketAddressITiberiu Breana2015-06-041-0/+12
| | | |/
* | | | am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for me...Kenny Root2015-06-040-0/+0
|\ \ \ \ | |/ / /
| * | | am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b189...Kenny Root2015-06-040-0/+0
| |\ \ \ | | |/ / | |/| |
| | * | am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-mod...Kenny Root2015-06-020-0/+0
| | |\ \
| | | * \ am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-020-0/+0
| | | |\ \
| | | | * \ resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-010-0/+0
| | | | |\ \
| | | | | * | OpenSSLX509Certificate: mark mContext as transientKenny Root2015-05-293-1/+113
* | | | | | | am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicast interfaces"...Neil Fuller2015-06-020-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo...Neil Fuller2015-06-021-1/+1
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | * | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo...Neil Fuller2015-06-021-1/+1
| | |\ \ \ \ \
| | | * | | | | Fix for MulticastSocketTest for non-multicast interfacesNeil Fuller2015-06-021-1/+1
| | |/ / / / /
* | | | | | | am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-...Richard Uhler2015-06-021-285/+163
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
| | |\ \ \ \ \
| | | * | | | | Fix problems with DexClassLoaderTest.Richard Uhler2015-05-291-285/+163
| | |/ / / / /
* | | | | | | am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into jb-dev autom...Bill Yi2015-05-280-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | | * | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | | | |\ \ \
| | | | | * \ \ Merge "Fix race condition in WeakHashMapTest." into jb-devBill Yi2015-05-280-0/+0
| | | | | |\ \ \
| | | | | | * \ \ Merge "Fix race condition in WeakHashMapTest." into jb-devBill Yi2014-07-071-6/+12
| | | | | | |\ \ \
| | | | | | | * | | Fix race condition in WeakHashMapTest.Mathieu Chartier2014-07-081-6/+12
| | | | | | |/ / /
* | | | | | | | | resolved conflicts for merge of 72b26859 to lmp-mr1-ub-devNeil Fuller2015-05-261-0/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge "Suppress a couple of tests that need quite a lot of memory" into lolli...Neil Fuller2015-05-261-0/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Suppress a couple of tests that need quite a lot of memoryNeil Fuller2015-05-231-0/+8
| |/ / / / / / / /
* | | | | | | | | am 8b7dbade: Merge "Move Class.newInstance to native"Mathieu Chartier2015-04-253-34/+8
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge "Move Class.newInstance to native"Mathieu Chartier2015-04-253-34/+8
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Move Class.newInstance to nativeMathieu Chartier2015-04-243-34/+8
| |/ / / / / / / / /
* | | | | | | | | | am dce989e5: Merge "Update Cipher tests"Kenny Root2015-04-241-0/+50
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge "Update Cipher tests"Kenny Root2015-04-241-0/+50
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Update Cipher testsKenny Root2015-04-241-0/+50
* | | | | | | | | | | am 1681b2cf: Merge "Fix hashCode() for the read barrier lock word change."Hiroshi Yamauchi2015-04-241-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge "Fix hashCode() for the read barrier lock word change."Hiroshi Yamauchi2015-04-241-3/+4
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix hashCode() for the read barrier lock word change.Hiroshi Yamauchi2015-04-231-3/+4
* | | | | | | | | | | | am 69f8fc65: Merge "Use ANDROID_ROOT instead of assuming it is /system."Nicolas Geoffray2015-04-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge "Use ANDROID_ROOT instead of assuming it is /system."Nicolas Geoffray2015-04-241-1/+1
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Use ANDROID_ROOT instead of assuming it is /system.Nicolas Geoffray2015-04-241-1/+1
* | | | | | | | | | | | | am 2b7e589a: Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-246-17/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "Tidy up Package and classloader comments"Neil Fuller2015-04-246-17/+57
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Tidy up Package and classloader commentsNeil Fuller2015-04-226-17/+57
* | | | | | | | | | | | | | am dcc9e76a: Merge "Remove unnecessary code from InputStreamReader/OutputStre...Narayan Kamath2015-04-242-2/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Merge "Remove unnecessary code from InputStreamReader/OutputStreamWriter.init."Narayan Kamath2015-04-242-2/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Remove unnecessary code from InputStreamReader/OutputStreamWriter.init.Narayan Kamath2015-04-242-2/+7
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | am 73e9c6e1: Merge "java/io/RandomAccessFile: do not nullify FileChannel when...Sergio Giro2015-04-242-1/+61
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Merge "java/io/RandomAccessFile: do not nullify FileChannel when closing the ...Sergio Giro2015-04-242-1/+61
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |