| commit | 45101b8ebb8d2261c1733d305f5e165971ef7dc1 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Sep 04 22:10:30 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 22:10:30 2015 +0000 |
| tree | 4436717d100ff61279c0a332eded42738bd034a4 | |
| parent | 4fe837f0ea8682a7e4fd8802b88c9721de517192 [diff] | |
| parent | 9f275caac3c90dac2d91c2faf94f4179c9d90fb7 [diff] |
am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '9f275caac3c90dac2d91c2faf94f4179c9d90fb7': Skip TimaKeyStore in KeyStoreTest