summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_libcore into...HEADreplicant-6.0-0001replicant-6.0Wolfgang Wiedmeyer2016-12-1210-29/+303
|\
| * Merge tag 'android-6.0.1_r74' into HEADJessica Wagantall2016-11-092-4/+16
| |\
| | * IDN: Fix handling of long domain names.Narayan Kamath2016-09-272-4/+16
| * | Merge tag 'android-6.0.1_r72' into HEADJessica Wagantall2016-10-060-0/+0
| |\ \
| | * | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-08-161-3/+4
| * | | Merge tag 'android-6.0.1_r66' into HEADJessica Wagantall2016-09-071-3/+4
| |\ \ \ | | | |/ | | |/|
| | * | CipherTest: in ASN1 encoding for GCM, no value for tag size means 12Sergio Giro2016-07-211-3/+4
| | |/
| * | Merge tag 'android-6.0.1_r43' into HEADJessica Wagantall2016-05-031-0/+68
| |\ \ | | |/
| | * CipherTest: add test for multiple updateAAD callsKenny Root2016-03-251-0/+27
| | * CipherTest: test instance reuse with updateAADKenny Root2016-03-251-0/+41
| * | XML Pull Parser optimizationsKevin Hart2016-04-201-8/+66
| * | Merge tag 'android-6.0.1_r30' into HEADJessica Wagantall2016-04-180-0/+0
| |\ \ | | |/
| | * GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-02-261-0/+22
| * | Merge tag 'android-6.0.1_r24' into HEADJessica Wagantall2016-04-051-0/+22
| |\ \
| | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-220-0/+0
| | |\ \
| | | * \ merge in mnc-dr1.5-release history after reset to mnc-dr1.5-devThe Android Automerger2016-03-170-0/+0
| | | |\ \ | | | |/ / | | |/| |
| | * | | GCMParameters: check that the default tag size is secure (16 bits)Sergio Giro2016-03-011-0/+22
| | |/ /
| * | | Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/li...Steve Kondik2016-03-106-17/+130
| |\ \ \ | | |/ /
| | * | Check for RFC 5746 TLS extensionKenny Root2016-01-062-2/+19
| | * | Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev a...Daniel Xie2015-12-211-2/+7
| | |\ \
| | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-dev a...Daniel Xie2015-12-211-2/+7
| | | |\ \
| | | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devDaniel Xie2015-12-211-2/+7
| | | | |\ \
| | | | | * \ Merge "Change FinalizeTest to use helper function" into marshmallow-cts-devDaniel Xie2015-12-211-2/+7
| | | | | |\ \
| | | | | | * | Change FinalizeTest to use helper functionMathieu Chartier2015-12-101-2/+7
| | * | | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...Daniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ | | | | | |/ / /
| | | | | * | | Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \
| | | | | | * \ \ Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-dev am:...Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \
| | | | | | | * \ \ Merge "Fixes associated with the tzdata 2015a update" into kitkat-cts-devDaniel Xie2015-12-060-0/+0
| | | | | | | |\ \ \
| | * | | | | | \ \ \ Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / /
| | | | * | | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / /
| | | | | | * | | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge "Fix TimeZoneTest#testPreHistoricOffsets CTS failures." into kitkat-cts...Daniel Xie2015-12-061-36/+15
| | | | | | | |\ \ \ \
| | * | | | | | \ \ \ \ Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-140-0/+0
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-140-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-140-0/+0
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-100-0/+0
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | | | | | | / / | | | | | | |_|_|_|/ / | | | | | |/| | | | |
| | | | | | * | | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-060-0/+0
| | | | | | |\ \ \ \ \ | | | | | | | |/ / / /
| | | | | | | * | | | Merge "Fix the ENGINE_finish/ENGINE_free mixup The tests were calling finish ...Daniel Xie2015-12-060-0/+0
| | | | | | | |\ \ \ \
| | * | | | | | \ \ \ \ Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 111...Daniel Xie2015-12-032-12/+103
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-dev am: 111...Daniel Xie2015-12-032-12/+103
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devDaniel Xie2015-12-032-12/+103
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / /
| | | | | * | | | | | | Merge "Add more debugging to the DigestTest" into marshmallow-cts-devDaniel Xie2015-12-032-12/+103
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Add more debugging to the DigestTestKenny Root2015-10-272-12/+103
| | * | | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars...Daniel Xie2015-12-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / /
| | | * | | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars...Daniel Xie2015-12-031-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Merge "Fix time calculation in test_SSLSession_getLastAccessedTime" into mars...Daniel Xie2015-12-031-1/+1
| | | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / | | | | | | | | | | | | / | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |