diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-01 20:35:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 20:35:36 +0000 |
| commit | ae55367e2ce74cdddee15ee556092f9377f51ca2 (patch) | |
| tree | 3c33a58425b68749714b711ef240fa05104b5a17 | |
| parent | d4ab7cbb795df85a9a8fc2818750cf648f5ae42f (diff) | |
| parent | 4f869c1c96de4c18c57d8fa2c36de4bf04de84c0 (diff) | |
| download | libcore-ae55367e2ce74cdddee15ee556092f9377f51ca2.zip libcore-ae55367e2ce74cdddee15ee556092f9377f51ca2.tar.gz libcore-ae55367e2ce74cdddee15ee556092f9377f51ca2.tar.bz2 | |
am 4f869c1c: am 7634c954: am e6440690: am 0a0b1797: am 4822b351: am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac
* commit '4f869c1c96de4c18c57d8fa2c36de4bf04de84c0':
0 files changed, 0 insertions, 0 deletions