Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mnc-dev' of https://googleplex-android.googlesource.com/_direct... | Hudson Mdm | 2015-06-09 | 1 | -57/+0 |
|\ | |||||
| * | Merge "Update CA certificates" into mnc-dev | Kenny Root | 2015-06-09 | 1 | -57/+0 |
| |\ | |||||
| | * | Update CA certificates | Kenny Root | 2015-06-09 | 1 | -57/+0 |
* | | | am bb1ac7e9: am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connect... | Daniel Xie | 2015-06-09 | 0 | -0/+0 |
|\ \ \ | |/ / |/| | | |||||
| * | | am 9e80da3a: am 7329657b: Merge "Add exceptions for test_connectLjava_net_Soc... | Daniel Xie | 2015-06-08 | 0 | -0/+0 |
| |\ \ | |||||
| | * \ | am 7329657b: Merge "Add exceptions for test_connectLjava_net_SocketAddressI" ... | Daniel Xie | 2015-06-08 | 1 | -0/+12 |
| | |\ \ | |||||
| | | * \ | Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop... | Daniel Xie | 2015-06-08 | 1 | -0/+12 |
| | | |\ \ | |||||
| | | | * \ | Merge "Add exceptions for test_connectLjava_net_SocketAddressI" into lollipop... | Daniel Xie | 2015-06-04 | 1 | -0/+12 |
| | | | |\ \ | |||||
| | | | | * | | Add exceptions for test_connectLjava_net_SocketAddressI | Tiberiu Breana | 2015-06-04 | 1 | -0/+12 |
| | | | |/ / | |||||
* | | | | | | Skip AndroidKeyStore provider in ECDHKeyAgreementTest. | Alex Klyubin | 2015-06-09 | 1 | -4/+19 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | libcore: throw InvalidKeyException instead of ProviderException | Sergio Giro | 2015-06-09 | 9 | -56/+375 |
* | | | | | Update CA certificates | Kenny Root | 2015-06-08 | 19 | -861/+890 |
* | | | | | am 3039ab33: am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved con... | Kenny Root | 2015-06-06 | 0 | -0/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | am 81a0cd77: am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for me... | Kenny Root | 2015-06-04 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | am a6eb9b5f: am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b189... | Kenny Root | 2015-06-04 | 0 | -0/+0 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | am 9585bbef: am d9b110bb: resolved conflicts for merge of d8b18995 to klp-mod... | Kenny Root | 2015-06-02 | 0 | -0/+0 |
| | | |\ \ | |||||
| | | | * \ | am d9b110bb: resolved conflicts for merge of d8b18995 to klp-modular-dev | Kenny Root | 2015-06-02 | 0 | -0/+0 |
| | | | |\ \ | |||||
| | | | | * \ | resolved conflicts for merge of d8b18995 to klp-modular-dev | Kenny Root | 2015-06-01 | 0 | -0/+0 |
| | | | | |\ \ | |||||
| | | | | | * | | OpenSSLX509Certificate: mark mContext as transient | Kenny Root | 2015-05-29 | 3 | -1/+113 |
* | | | | | | | | Merge "Add VMRuntime.runFinalizationWithTimeout" into mnc-dev | Mathieu Chartier | 2015-06-05 | 3 | -11/+47 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add VMRuntime.runFinalizationWithTimeout | Mathieu Chartier | 2015-06-05 | 3 | -11/+47 |
* | | | | | | | | | Ignore AndroidKeyStore in SignatureTest. | Alex Klyubin | 2015-06-04 | 1 | -0/+6 |
|/ / / / / / / / | |||||
* | | | | | | | | No need to test EC keys of 192 bits | Kenny Root | 2015-06-04 | 1 | -4/+4 |
* | | | | | | | | Merge "Update offered ciphers" into mnc-dev | Kenny Root | 2015-06-04 | 3 | -150/+150 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Update offered ciphers | Kenny Root | 2015-06-04 | 3 | -150/+150 |
* | | | | | | | | | Merge "Replace hyphen with en dash" into mnc-dev | Kenny Root | 2015-06-04 | 2 | -112/+112 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | Replace hyphen with en dash | Kenny Root | 2015-06-03 | 2 | -112/+112 |
* | | | | | | | | | am 5d40866c: am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicas... | Neil Fuller | 2015-06-04 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | am b96afd7c: Merge "Fix for MulticastSocketTest for non-multicast interfaces"... | Neil Fuller | 2015-06-02 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo... | Neil Fuller | 2015-06-02 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipo... | Neil Fuller | 2015-06-02 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ | |||||
| | | | * | | | | | | Fix for MulticastSocketTest for non-multicast interfaces | Neil Fuller | 2015-06-02 | 1 | -1/+1 |
| | | |/ / / / / / | |||||
* | | | | | | | | | am 9cd2e604: am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into ... | Richard Uhler | 2015-06-04 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | am 3ad9b586: Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-... | Richard Uhler | 2015-06-02 | 1 | -285/+163 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-dev | Richard Uhler | 2015-06-01 | 1 | -285/+163 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge "Fix problems with DexClassLoaderTest." into lollipop-cts-dev | Richard Uhler | 2015-06-01 | 1 | -285/+163 |
| | | |\ \ \ \ \ | |||||
| | | | * | | | | | Fix problems with DexClassLoaderTest. | Richard Uhler | 2015-05-29 | 1 | -285/+163 |
| | | |/ / / / / | |||||
* | | | | | | | | Merge "Configure ICU4C without relying on build-time flags" into mnc-dev | Neil Fuller | 2015-06-03 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Configure ICU4C without relying on build-time flags | Neil Fuller | 2015-06-03 | 1 | -2/+7 |
* | | | | | | | | | Improve HttpURLConnection Performance docs | Neil Fuller | 2015-06-03 | 1 | -6/+14 |
|/ / / / / / / / | |||||
* | | | | | | | | Move mirror::ArtMethod to native | Mathieu Chartier | 2015-06-01 | 4 | -89/+15 |
* | | | | | | | | Merge "Signature2Test: calling verify a second time can throw" into mnc-dev | Kenny Root | 2015-06-01 | 1 | -11/+4 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Signature2Test: calling verify a second time can throw | Kenny Root | 2015-05-29 | 1 | -11/+4 |
* | | | | | | | | | Add test_PacketSocketAddress to the list of known failures. | Narayan Kamath | 2015-06-01 | 1 | -0/+8 |
|/ / / / / / / / | |||||
* | | | | | | | | am 01f1a78b: am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | am c039fc1e: Merge "Fix race condition in WeakHashMapTest." into jb-dev autom... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | | * | | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | | | |\ \ \ \ | | | | | |_|_|/ | | | | |/| | | | |||||
| | | | | * | | | Merge "Fix race condition in WeakHashMapTest." into jb-dev automerge: 62538d8... | Bill Yi | 2015-05-28 | 0 | -0/+0 |
| | | | | |\ \ \ |