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