summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolved conflicts for merge of 55c22223 to masterBrian Carlstrom2014-05-081-0/+8
|\
| * am aaff3a2b: am 4258671e: Merge "Blacklist ControlTest test case."Neil Fuller2014-05-081-0/+8
| |\
| | * am 4258671e: Merge "Blacklist ControlTest test case."Neil Fuller2014-05-081-0/+8
| | |\
| | | * Merge "Blacklist ControlTest test case."Neil Fuller2014-05-081-0/+8
| | | |\
| | | | * Blacklist ControlTest test case.Neil Fuller2014-05-081-0/+8
* | | | | am 0d6d3292: am 6005b896: am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-083-12/+58
|\ \ \ \ \ | |/ / / /
| * | | | am 6005b896: am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-083-12/+58
| |\ \ \ \ | | |/ / /
| | * | | am 4abcf7ad: Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-083-12/+58
| | |\ \ \ | | | |/ /
| | | * | Merge changes Iaaafcbed,Ifbca5637Kenny Root2014-05-083-12/+58
| | | |\ \
| | | | * | KeyStoreTest: add more key typesKenny Root2014-05-071-6/+39
| | | | * | KeyManagerFactoryTest: add all the possible key typesKenny Root2014-05-072-6/+19
* | | | | | am 578741db: am c0a0523f: am 0ce04075: Merge "NIST-PKITS: add testDeltaCRLs_V...Kenny Root2014-05-080-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am c0a0523f: am 0ce04075: Merge "NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLT...Kenny Root2014-05-080-0/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | am 0ce04075: Merge "NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5"Kenny Root2014-05-081-0/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge "NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5"Kenny Root2014-05-081-0/+1
| | | |\ \ \
| | | | * | | NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5Kenny Root2014-05-071-0/+1
| | | |/ / /
* | | | | | am 4e9e10e3: (-s ours) am f134e286: DO NOT MERGE NIST-PKITS: add testDeltaCRL...Kenny Root2014-05-080-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am f134e286: DO NOT MERGE NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5Kenny Root2014-05-081-0/+1
| |\ \ \ \ \
| | * | | | | DO NOT MERGE NIST-PKITS: add testDeltaCRLs_ValiddeltaCRLTest5Kenny Root2014-05-071-0/+1
* | | | | | | am dbd9cfbf: am bb3c15ae: am 5b8b1ea0: Merge "Ensure consistent (backwards-co...Elliott Hughes2014-05-082-126/+133
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am bb3c15ae: am 5b8b1ea0: Merge "Ensure consistent (backwards-compatible) cap...Elliott Hughes2014-05-082-126/+133
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am 5b8b1ea0: Merge "Ensure consistent (backwards-compatible) capitalization f...Elliott Hughes2014-05-082-126/+133
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "Ensure consistent (backwards-compatible) capitalization for yesterday/...Elliott Hughes2014-05-082-126/+133
| | | |\ \ \ \
| | | | * | | | Ensure consistent (backwards-compatible) capitalization for yesterday/today/t...Elliott Hughes2014-05-072-126/+133
| | | |/ / / /
* | | | | | | am 89f291be: am 5af8231d: am 5a9c2b9e: Merge "Basic documentation for android...Elliott Hughes2014-05-0810-36/+511
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 5af8231d: am 5a9c2b9e: Merge "Basic documentation for android.system."Elliott Hughes2014-05-0710-36/+511
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 5a9c2b9e: Merge "Basic documentation for android.system."Elliott Hughes2014-05-0710-36/+511
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge "Basic documentation for android.system."Elliott Hughes2014-05-0710-36/+511
| | | |\ \ \ \
| | | | * | | | Basic documentation for android.system.Elliott Hughes2014-05-0710-36/+511
* | | | | | | | Merge "Unhide further 1.7-era APIs"Neil Fuller2014-05-089-23/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Unhide further 1.7-era APIsNeil Fuller2014-05-089-23/+7
* | | | | | | | | am d4eddceb: am d78ce77e: am d8eb43c1: Merge "Change ReferenceQueue order fro...Narayan Kamath2014-05-071-9/+12
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am d78ce77e: am d8eb43c1: Merge "Change ReferenceQueue order from LIFO to FIFO."Narayan Kamath2014-05-071-9/+12
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | am d8eb43c1: Merge "Change ReferenceQueue order from LIFO to FIFO."Narayan Kamath2014-05-071-9/+12
| | |\ \ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge "Change ReferenceQueue order from LIFO to FIFO."Narayan Kamath2014-05-071-9/+12
| | | |\ \ \ \ \ \
| | | | * | | | | | Change ReferenceQueue order from LIFO to FIFO.Elena Sayapina2014-05-061-9/+12
* | | | | | | | | | am 982fb068: am 14f4875c: am db3cbbc3: Merge "Add java.security.cert.Extensio...Kenny Root2014-05-073-9/+83
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 14f4875c: am db3cbbc3: Merge "Add java.security.cert.Extension interface"Kenny Root2014-05-073-9/+83
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am db3cbbc3: Merge "Add java.security.cert.Extension interface"Kenny Root2014-05-063-9/+83
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Merge "Add java.security.cert.Extension interface"Kenny Root2014-05-063-9/+83
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | | * | | | | | Add java.security.cert.Extension interfaceKenny Root2014-05-063-9/+83
| | | |/ / / / / /
* | | | | | | | | Unhide new SSL APIsKenny Root2014-05-064-5/+0
* | | | | | | | | am 91a37e34: am 5f7fd3f1: am f560c538: Merge "Revert "Libcore: Remove <> in C...Andreas Gampe2014-05-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am 5f7fd3f1: am f560c538: Merge "Revert "Libcore: Remove <> in CloseGuardMoni...Andreas Gampe2014-05-061-2/+2
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | am f560c538: Merge "Revert "Libcore: Remove <> in CloseGuardMonitor test class""Andreas Gampe2014-05-061-2/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge "Revert "Libcore: Remove <> in CloseGuardMonitor test class""Andreas Gampe2014-05-061-2/+2
| | | |\ \ \ \ \ \
| | | | * | | | | | Revert "Libcore: Remove <> in CloseGuardMonitor test class"Andreas Gampe2014-05-061-2/+2
* | | | | | | | | | am dcba4073: am 99edd646: am 32ec257f: Merge "Fix BN to use correct size of a...Narayan Kamath2014-05-061-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 99edd646: am 32ec257f: Merge "Fix BN to use correct size of array"Narayan Kamath2014-05-061-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 32ec257f: Merge "Fix BN to use correct size of array"Narayan Kamath2014-05-061-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /