Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | | | | | | | * | | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-09-02 | 0 | -0/+0 | |
| | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-29 | 0 | -0/+0 | |
| | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-28 | 0 | -0/+0 | |
| | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-27 | 0 | -0/+0 | |
| | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-26 | 0 | -0/+0 | |
| | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-22 | 0 | -0/+0 | |
| | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-21 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | | * | | | Add another test for HttpURLConnection#usingProxy | Narayan Kamath | 2013-08-20 | 1 | -0/+4 | |
| | | | | | | | | | | | | | | | * | | | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-20 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | | | * \ \ | merge in klp-release history after reset to klp-dev | The Android Automerger | 2013-08-19 | 0 | -0/+0 | |
| | | | | | | | | | | | | | | | | |\ \ \ | ||||||
| | | | | | | | | | | | | | | | | | * | | | Fix URLConnectionTest#testConnectTimeouts. | Narayan Kamath | 2013-08-15 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | * | | | Share ClassLoader code | Brian Carlstrom | 2013-08-15 | 6 | -906/+36 | |
* | | | | | | | | | | | | | | | | | | | | | am 9b053422: am a3366b1f: Merge "ProviderTest: add special rules for Cipher" | Kenny Root | 2013-10-08 | 1 | -16/+34 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | am a3366b1f: Merge "ProviderTest: add special rules for Cipher" | Kenny Root | 2013-10-08 | 1 | -16/+34 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "ProviderTest: add special rules for Cipher" | Kenny Root | 2013-10-08 | 1 | -16/+34 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | ProviderTest: add special rules for Cipher | Kenny Root | 2013-10-07 | 1 | -16/+34 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am b1e3075a: am d4a28a4a: Merge "Stop using deprecated ucol_safeClone placeme... | Elliott Hughes | 2013-10-07 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am d4a28a4a: Merge "Stop using deprecated ucol_safeClone placement functional... | Elliott Hughes | 2013-10-07 | 1 | -2/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Stop using deprecated ucol_safeClone placement functionality." | Elliott Hughes | 2013-10-07 | 1 | -2/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Stop using deprecated ucol_safeClone placement functionality. | Elliott Hughes | 2013-10-07 | 1 | -2/+1 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am b151db09: resolved conflicts for merge of b6fb99fd to klp-dev-plus-aosp | Kenny Root | 2013-10-02 | 137 | -39288/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | resolved conflicts for merge of b6fb99fd to klp-dev-plus-aosp | Kenny Root | 2013-10-02 | 137 | -39288/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Move conscrypt out to external/conscrypt" | Kenny Root | 2013-10-03 | 137 | -39288/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Move conscrypt out to external/conscrypt | Kenny Root | 2013-10-01 | 137 | -39288/+1 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am ba7e87db: am 34f81a14: ZipFile: fix comparison for offset, pt 2 | Kenny Root | 2013-10-02 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 34f81a14: ZipFile: fix comparison for offset, pt 2 | Kenny Root | 2013-10-02 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | ZipFile: fix comparison for offset, pt 2 | Kenny Root | 2013-10-01 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | | | | | | | am 8e3ffa3d: am a0f57f03: Merge "ZipFile: fix comparison for offset" into klp... | Kenny Root | 2013-10-02 | 1 | -4/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am a0f57f03: Merge "ZipFile: fix comparison for offset" into klp-dev | Kenny Root | 2013-10-02 | 1 | -4/+0 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "ZipFile: fix comparison for offset" into klp-dev | Kenny Root | 2013-10-01 | 1 | -4/+0 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | ZipFile: fix comparison for offset | Kenny Root | 2013-10-01 | 1 | -4/+0 | |
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | am c1e8aa4b: am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib" | Kenny Root | 2013-10-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib" | Kenny Root | 2013-10-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Conscrypt: add missing libraries to JNI lib" | Kenny Root | 2013-10-02 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Conscrypt: add missing libraries to JNI lib | Kenny Root | 2013-10-01 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am 88a8766a: am 800d4b54: Merge "Conscrypt: fixing Android.mk dependencies" | Kenny Root | 2013-10-01 | 1 | -9/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 800d4b54: Merge "Conscrypt: fixing Android.mk dependencies" | Kenny Root | 2013-10-01 | 1 | -9/+12 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Conscrypt: fixing Android.mk dependencies" | Kenny Root | 2013-10-02 | 1 | -9/+12 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Conscrypt: fixing Android.mk dependencies | Kenny Root | 2013-10-01 | 1 | -9/+12 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am 52041a8b: am 4d11667c: Merge "I before E, except after C" | Kenny Root | 2013-10-01 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 4d11667c: Merge "I before E, except after C" | Kenny Root | 2013-10-01 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "I before E, except after C" | Kenny Root | 2013-10-01 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | I before E, except after C | Kenny Root | 2013-10-01 | 1 | -2/+2 | |
| | |/ / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | am 5af43438: am 213ea54a: Merge "Add prefix to cert pin failure logging." int... | William Luh | 2013-10-01 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | am 213ea54a: Merge "Add prefix to cert pin failure logging." into klp-dev | William Luh | 2013-10-01 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Merge "Add prefix to cert pin failure logging." into klp-dev | William Luh | 2013-09-30 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | | * | | | | | | | | | | | | | | | | | | Add prefix to cert pin failure logging. | William Luh | 2013-09-25 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | am 9030112e: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android... | Geoff Mendal | 2013-10-01 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'klp-dev-plus-aosp' of https://googleplex-android.googlesource.c... | Geoff Mendal | 2013-09-30 | 3 | -86/+88 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 8a6ea917: am 25adf29f: Conscrypt: correct key selection with no sigAlg | Kenny Root | 2013-10-01 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |