diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-15 01:02:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-15 01:02:15 +0000 |
| commit | 55b43a5c0203cfb5bab43c94be4ad411fa28812d (patch) | |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a | |
| parent | 507bf14855b99fc39a2a527faeeee8cac5bbf2d7 (diff) | |
| parent | 141d6fed07ed5fc07977aba1cd2eda8358058e27 (diff) | |
| download | libcore-55b43a5c0203cfb5bab43c94be4ad411fa28812d.zip libcore-55b43a5c0203cfb5bab43c94be4ad411fa28812d.tar.gz libcore-55b43a5c0203cfb5bab43c94be4ad411fa28812d.tar.bz2 | |
am 141d6fed: am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev
* commit '141d6fed07ed5fc07977aba1cd2eda8358058e27':
0 files changed, 0 insertions, 0 deletions