summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct...Hudson Mdm2015-06-091-57/+0
|\
| * Merge "Update CA certificates" into mnc-devKenny Root2015-06-091-57/+0
| |\
| | * Update CA certificatesKenny Root2015-06-091-57/+0
* | | am bb1ac7e9: am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connect...Daniel Xie2015-06-090-0/+0
|\ \ \ | |/ / |/| |
| * | am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connectLjava_net_Soc...Daniel Xie2015-06-080-0/+0
| |\ \
| | * \ am 7329657b: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ...Daniel Xie2015-06-081-0/+12
| | |\ \
| | | * \ Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-081-0/+12
| | | |\ \
| | | | * \ Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop...Daniel Xie2015-06-041-0/+12
| | | | |\ \
| | | | | * | Add exceptions for test_connectLjava_net_SocketAddressITiberiu Breana2015-06-041-0/+12
| | | | |/ /
* | | | | | Skip AndroidKeyStore provider in ECDHKeyAgreementTest.Alex Klyubin2015-06-091-4/+19
| |_|_|_|/ |/| | | |
* | | | | libcore: throw InvalidKeyException instead of ProviderExceptionSergio Giro2015-06-099-56/+375
* | | | | Update CA certificatesKenny Root2015-06-0819-861/+890
* | | | | am 3039ab33: am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved con...Kenny Root2015-06-060-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for me...Kenny Root2015-06-040-0/+0
| |\ \ \ \ | | |/ / /
| | * | | am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b189...Kenny Root2015-06-040-0/+0
| | |\ \ \ | | | |/ / | | |/| |
| | | * | am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-mod...Kenny Root2015-06-020-0/+0
| | | |\ \
| | | | * \ am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-020-0/+0
| | | | |\ \
| | | | | * \ resolved conflicts for merge of d8b18995 to klp-modular-devKenny Root2015-06-010-0/+0
| | | | | |\ \
| | | | | | * | OpenSSLX509Certificate: mark mContext as transientKenny Root2015-05-293-1/+113
* | | | | | | | Merge "Add VMRuntime.runFinalizationWithTimeout" into mnc-devMathieu Chartier2015-06-053-11/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Add VMRuntime.runFinalizationWithTimeoutMathieu Chartier2015-06-053-11/+47
* | | | | | | | | Ignore AndroidKeyStore in SignatureTest.Alex Klyubin2015-06-041-0/+6
|/ / / / / / / /
* | | | | | | | No need to test EC keys of 192 bitsKenny Root2015-06-041-4/+4
* | | | | | | | Merge "Update offered ciphers" into mnc-devKenny Root2015-06-043-150/+150
|\ \ \ \ \ \ \ \
| * | | | | | | | Update offered ciphersKenny Root2015-06-043-150/+150
* | | | | | | | | Merge "Replace hyphen with en dash" into mnc-devKenny Root2015-06-042-112/+112
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Replace hyphen with en dashKenny Root2015-06-032-112/+112
* | | | | | | | | am 5d40866c: am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicas...Neil Fuller2015-06-040-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicast interfaces"...Neil Fuller2015-06-020-0/+0
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo...Neil Fuller2015-06-021-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo...Neil Fuller2015-06-021-1/+1
| | | |\ \ \ \ \ \
| | | | * | | | | | Fix for MulticastSocketTest for non-multicast interfacesNeil Fuller2015-06-021-1/+1
| | | |/ / / / / /
* | | | | | | | | am 9cd2e604: am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into ...Richard Uhler2015-06-040-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-...Richard Uhler2015-06-021-285/+163
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-devRichard Uhler2015-06-011-285/+163
| | | |\ \ \ \ \
| | | | * | | | | Fix problems with DexClassLoaderTest.Richard Uhler2015-05-291-285/+163
| | | |/ / / / /
* | | | | | | | Merge "Configure ICU4C without relying on build-time flags" into mnc-devNeil Fuller2015-06-031-2/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Configure ICU4C without relying on build-time flagsNeil Fuller2015-06-031-2/+7
* | | | | | | | | Improve HttpURLConnection Performance docsNeil Fuller2015-06-031-6/+14
|/ / / / / / / /
* | | | | | | | Move mirror::ArtMethod to nativeMathieu Chartier2015-06-014-89/+15
* | | | | | | | Merge "Signature2Test: calling verify a second time can throw" into mnc-devKenny Root2015-06-011-11/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Signature2Test: calling verify a second time can throwKenny Root2015-05-291-11/+4
* | | | | | | | | Add test_PacketSocketAddress to the list of known failures.Narayan Kamath2015-06-011-0/+8
|/ / / / / / / /
* | | | | | | | am 01f1a78b: am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into...Bill Yi2015-05-280-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into jb-dev autom...Bill Yi2015-05-280-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | | * | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8...Bill Yi2015-05-280-0/+0
| | | | | |\ \ \