summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | | | | | | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-09-020-0/+0
| | | | | | | | | |\ \ \
| | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-290-0/+0
| | | | | | | | | | |\ \ \
| | | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-280-0/+0
| | | | | | | | | | | |\ \ \
| | | | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-270-0/+0
| | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-260-0/+0
| | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-220-0/+0
| | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-210-0/+0
| | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | * | | Add another test for HttpURLConnection#usingProxyNarayan Kamath2013-08-201-0/+4
| | | | | | | | | | | | | | | | * | | merge in klp-release history after reset to klp-devThe Android Automerger2013-08-200-0/+0
| | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | * \ \ merge in klp-release history after reset to klp-devThe Android Automerger2013-08-190-0/+0
| | | | | | | | | | | | | | | | | |\ \ \
| | | | | | | | | | | | | | | | | | * | | Fix URLConnectionTest#testConnectTimeouts.Narayan Kamath2013-08-151-2/+5
| | | | | | | | | | | | | | | | | | * | | Share ClassLoader codeBrian Carlstrom2013-08-156-906/+36
* | | | | | | | | | | | | | | | | | | | | am 9b053422: am a3366b1f: Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | / / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | am a3366b1f: Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "ProviderTest: add special rules for Cipher"Kenny Root2013-10-081-16/+34
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | ProviderTest: add special rules for CipherKenny Root2013-10-071-16/+34
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am b1e3075a: am d4a28a4a: Merge "Stop using deprecated ucol_safeClone placeme...Elliott Hughes2013-10-071-2/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am d4a28a4a: Merge "Stop using deprecated ucol_safeClone placement functional...Elliott Hughes2013-10-071-2/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Stop using deprecated ucol_safeClone placement functionality."Elliott Hughes2013-10-071-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Stop using deprecated ucol_safeClone placement functionality.Elliott Hughes2013-10-071-2/+1
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am b151db09: resolved conflicts for merge of b6fb99fd to klp-dev-plus-aospKenny Root2013-10-02137-39288/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | resolved conflicts for merge of b6fb99fd to klp-dev-plus-aospKenny Root2013-10-02137-39288/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Move conscrypt out to external/conscrypt"Kenny Root2013-10-03137-39288/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Move conscrypt out to external/conscryptKenny Root2013-10-01137-39288/+1
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am ba7e87db: am 34f81a14: ZipFile: fix comparison for offset, pt 2Kenny Root2013-10-021-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 34f81a14: ZipFile: fix comparison for offset, pt 2Kenny Root2013-10-021-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | ZipFile: fix comparison for offset, pt 2Kenny Root2013-10-011-2/+2
* | | | | | | | | | | | | | | | | | | | am 8e3ffa3d: am a0f57f03: Merge "ZipFile: fix comparison for offset" into klp...Kenny Root2013-10-021-4/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am a0f57f03: Merge "ZipFile: fix comparison for offset" into klp-devKenny Root2013-10-021-4/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "ZipFile: fix comparison for offset" into klp-devKenny Root2013-10-011-4/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | ZipFile: fix comparison for offsetKenny Root2013-10-011-4/+0
| | | | |/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | am c1e8aa4b: am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib"Kenny Root2013-10-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 13c5c066: Merge "Conscrypt: add missing libraries to JNI lib"Kenny Root2013-10-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Conscrypt: add missing libraries to JNI lib"Kenny Root2013-10-021-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Conscrypt: add missing libraries to JNI libKenny Root2013-10-011-1/+1
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 88a8766a: am 800d4b54: Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-011-9/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 800d4b54: Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-011-9/+12
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "Conscrypt: fixing Android.mk dependencies"Kenny Root2013-10-021-9/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Conscrypt: fixing Android.mk dependenciesKenny Root2013-10-011-9/+12
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 52041a8b: am 4d11667c: Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 4d11667c: Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | Merge "I before E, except after C"Kenny Root2013-10-011-2/+2
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | I before E, except after CKenny Root2013-10-011-2/+2
| | |/ / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | am 5af43438: am 213ea54a: Merge "Add prefix to cert pin failure logging." int...William Luh2013-10-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | am 213ea54a: Merge "Add prefix to cert pin failure logging." into klp-devWilliam Luh2013-10-011-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Merge "Add prefix to cert pin failure logging." into klp-devWilliam Luh2013-09-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | Add prefix to cert pin failure logging.William Luh2013-09-251-1/+1
* | | | | | | | | | | | | | | | | | | | | am 9030112e: Merge branch \'klp-dev-plus-aosp\' of https://googleplex-android...Geoff Mendal2013-10-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Merge branch 'klp-dev-plus-aosp' of https://googleplex-android.googlesource.c...Geoff Mendal2013-09-303-86/+88
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 8a6ea917: am 25adf29f: Conscrypt: correct key selection with no sigAlgKenny Root2013-10-010-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / /