| commit | 9f275caac3c90dac2d91c2faf94f4179c9d90fb7 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Sep 04 21:45:15 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Sep 04 21:45:15 2015 +0000 |
| tree | d73b45c70aa98ef0b5cc0b1cff1181235413ce4f | |
| parent | d5ae4a3c49703cb7678ccccc4e98ed6c4b1f5b73 [diff] | |
| parent | 977acac83f5c25a1d0ea4aed38af5f05672ce7c5 [diff] |
am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev * commit '977acac83f5c25a1d0ea4aed38af5f05672ce7c5': Skip TimaKeyStore in KeyStoreTest