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