diff options
| author | Daniel Xie <dxie@google.com> | 2015-07-17 17:25:56 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 17:25:56 +0000 |
| commit | 5fc8cd6d587a29822f50026778bd01d6487fb19c (patch) | |
| tree | c157f6abf581c4e5dd8f62908603bfabdc044f35 | |
| parent | c8596a95c03ce733ba8202c938f3c17a8f0b7827 (diff) | |
| parent | 05c1ad2bf948f2ff842c3b4c9b41cab0677dfa52 (diff) | |
| download | libcore-5fc8cd6d587a29822f50026778bd01d6487fb19c.zip libcore-5fc8cd6d587a29822f50026778bd01d6487fb19c.tar.gz libcore-5fc8cd6d587a29822f50026778bd01d6487fb19c.tar.bz2 | |
am 05c1ad2b: am 1f2b629a: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac automerge: c25d8ad
* commit '05c1ad2bf948f2ff842c3b4c9b41cab0677dfa52':
Skip TimaKeyStore in KeyStoreTest
0 files changed, 0 insertions, 0 deletions