Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connectLjava_net_Soc... | Daniel Xie | 2015-06-08 | 0 | -0/+0 |
|\ | |||||
| * | am 7329657b: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ... | Daniel Xie | 2015-06-08 | 1 | -0/+12 |
| |\ | |||||
| | * | Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop... | Daniel Xie | 2015-06-08 | 1 | -0/+12 |
| | |\ | |||||
| | | * | Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop... | Daniel Xie | 2015-06-04 | 1 | -0/+12 |
| | | |\ | |||||
| | | | * | Add exceptions for test_connectLjava_net_SocketAddressI | Tiberiu Breana | 2015-06-04 | 1 | -0/+12 |
| | | |/ | |||||
* | | | | am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for me... | Kenny Root | 2015-06-04 | 0 | -0/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b189... | Kenny Root | 2015-06-04 | 0 | -0/+0 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-mod... | Kenny Root | 2015-06-02 | 0 | -0/+0 |
| | |\ \ | |||||
| | | * \ | am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-dev | Kenny Root | 2015-06-02 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | resolved conflicts for merge of d8b18995 to klp-modular-dev | Kenny Root | 2015-06-01 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * | | OpenSSLX509Certificate: mark mContext as transient | Kenny Root | 2015-05-29 | 3 | -1/+113 |
* | | | | | | | am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicast interfaces"... | Neil Fuller | 2015-06-02 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo... | Neil Fuller | 2015-06-02 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo... | Neil Fuller | 2015-06-02 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix for MulticastSocketTest for non-multicast interfaces | Neil Fuller | 2015-06-02 | 1 | -1/+1 |
| | |/ / / / / | |||||
* | | | | | | | am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-... | Richard Uhler | 2015-06-02 | 1 | -285/+163 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-dev | Richard Uhler | 2015-06-01 | 1 | -285/+163 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-dev | Richard Uhler | 2015-06-01 | 1 | -285/+163 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Fix problems with DexClassLoaderTest. | Richard Uhler | 2015-05-29 | 1 | -285/+163 |
| | |/ / / / / | |||||
* | | | | | | | am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into jb-dev autom... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | | * | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | | | |\ \ \ | |||||
| | | | | * \ \ | Merge "Fix race condition in WeakHashMapTest." into jb-dev | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | | | | |\ \ \ | |||||
| | | | | | * \ \ | Merge "Fix race condition in WeakHashMapTest." into jb-dev | Bill Yi | 2014-07-07 | 1 | -6/+12 |
| | | | | | |\ \ \ | |||||
| | | | | | | * | | | Fix race condition in WeakHashMapTest. | Mathieu Chartier | 2014-07-08 | 1 | -6/+12 |
| | | | | | |/ / / | |||||
* | | | | | | | | | resolved conflicts for merge of 72b26859 to lmp-mr1-ub-dev | Neil Fuller | 2015-05-26 | 1 | -0/+8 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Merge "Suppress a couple of tests that need quite a lot of memory" into lolli... | Neil Fuller | 2015-05-26 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Suppress a couple of tests that need quite a lot of memory | Neil Fuller | 2015-05-23 | 1 | -0/+8 |
| |/ / / / / / / / | |||||
* | | | | | | | | | am 8b7dbade: Merge "Move Class.newInstance to native" | Mathieu Chartier | 2015-04-25 | 3 | -34/+8 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge "Move Class.newInstance to native" | Mathieu Chartier | 2015-04-25 | 3 | -34/+8 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Move Class.newInstance to native | Mathieu Chartier | 2015-04-24 | 3 | -34/+8 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | am dce989e5: Merge "Update Cipher tests" | Kenny Root | 2015-04-24 | 1 | -0/+50 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge "Update Cipher tests" | Kenny Root | 2015-04-24 | 1 | -0/+50 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Update Cipher tests | Kenny Root | 2015-04-24 | 1 | -0/+50 |
* | | | | | | | | | | | am 1681b2cf: Merge "Fix hashCode() for the read barrier lock word change." | Hiroshi Yamauchi | 2015-04-24 | 1 | -3/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Merge "Fix hashCode() for the read barrier lock word change." | Hiroshi Yamauchi | 2015-04-24 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Fix hashCode() for the read barrier lock word change. | Hiroshi Yamauchi | 2015-04-23 | 1 | -3/+4 |
* | | | | | | | | | | | | am 69f8fc65: Merge "Use ANDROID_ROOT instead of assuming it is /system." | Nicolas Geoffray | 2015-04-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | Merge "Use ANDROID_ROOT instead of assuming it is /system." | Nicolas Geoffray | 2015-04-24 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | Use ANDROID_ROOT instead of assuming it is /system. | Nicolas Geoffray | 2015-04-24 | 1 | -1/+1 |
* | | | | | | | | | | | | | am 2b7e589a: Merge "Tidy up Package and classloader comments" | Neil Fuller | 2015-04-24 | 6 | -17/+57 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge "Tidy up Package and classloader comments" | Neil Fuller | 2015-04-24 | 6 | -17/+57 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | Tidy up Package and classloader comments | Neil Fuller | 2015-04-22 | 6 | -17/+57 |
* | | | | | | | | | | | | | | am dcc9e76a: Merge "Remove unnecessary code from InputStreamReader/OutputStre... | Narayan Kamath | 2015-04-24 | 2 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | Merge "Remove unnecessary code from InputStreamReader/OutputStreamWriter.init." | Narayan Kamath | 2015-04-24 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | Remove unnecessary code from InputStreamReader/OutputStreamWriter.init. | Narayan Kamath | 2015-04-24 | 2 | -2/+7 |
| |/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | am 73e9c6e1: Merge "java/io/RandomAccessFile: do not nullify FileChannel when... | Sergio Giro | 2015-04-24 | 2 | -1/+61 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge "java/io/RandomAccessFile: do not nullify FileChannel when closing the ... | Sergio Giro | 2015-04-24 | 2 | -1/+61 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | |