| commit | 141d6fed07ed5fc07977aba1cd2eda8358058e27 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Tue Sep 15 00:51:13 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 15 00:51:13 2015 +0000 |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a | |
| parent | 3731a3c573e38d5a55b5ac5009bda77f6698061f [diff] | |
| parent | 9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9 [diff] |
am 9b98f31f: am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9':