diff options
| author | Daniel Xie <dxie@google.com> | 2015-07-17 16:47:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-07-17 16:47:24 +0000 |
| commit | c25d8adf4bc85882d0f18858db3724039e5affa5 (patch) | |
| tree | 6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2 /annotations/generate_annotated_java_files.py | |
| parent | 2cc187049ed0a5fc6168ffdb8f837b59462e5b53 (diff) | |
| parent | 977acac83f5c25a1d0ea4aed38af5f05672ce7c5 (diff) | |
Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev
automerge: 977acac
* commit '977acac83f5c25a1d0ea4aed38af5f05672ce7c5':
Skip TimaKeyStore in KeyStoreTest
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions