| commit | 9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Sat Sep 12 04:06:50 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Sep 12 04:06:50 2015 +0000 |
| tree | 299434f810e5e249959f228350541098f1d84f92 | |
| parent | 05b8a1b98dc6b85029776506eb07fe8c27c626c1 [diff] | |
| parent | 2ab5a4898ae61056b8eee8231f0761245dd93295 [diff] |
am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '2ab5a4898ae61056b8eee8231f0761245dd93295':