diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-01 09:14:48 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 09:14:48 +0000 |
| commit | edef8836113a0fd3f9b72be99ed997eebf7809ba (patch) | |
| tree | 6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2 /annotations/generate_annotated_java_files.py | |
| parent | dd2f751a6d7e0ab6a3ec89b025bd58194611cb62 (diff) | |
| parent | c25d8adf4bc85882d0f18858db3724039e5affa5 (diff) | |
am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac
* commit 'c25d8adf4bc85882d0f18858db3724039e5affa5':
Skip TimaKeyStore in KeyStoreTest
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions