| commit | 05c1ad2bf948f2ff842c3b4c9b41cab0677dfa52 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Fri Jul 17 17:03:07 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 17 17:03:07 2015 +0000 |
| tree | 3e8036136adde4c420932270bc17c99b1263a53d | |
| parent | 157dae465d0190edb0fb0bed8ad779cadd755faf [diff] | |
| parent | 1f2b629a224e675b9a2eaa7e44d0d6c5701046a1 [diff] |
am 1f2b629a: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac automerge: c25d8ad * commit '1f2b629a224e675b9a2eaa7e44d0d6c5701046a1': Skip TimaKeyStore in KeyStoreTest