diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-04 21:45:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-04 21:45:15 +0000 |
| commit | 9f275caac3c90dac2d91c2faf94f4179c9d90fb7 (patch) | |
| tree | d73b45c70aa98ef0b5cc0b1cff1181235413ce4f /annotations/generate_annotated_java_files.py | |
| parent | d5ae4a3c49703cb7678ccccc4e98ed6c4b1f5b73 (diff) | |
| parent | 977acac83f5c25a1d0ea4aed38af5f05672ce7c5 (diff) | |
am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev
* commit '977acac83f5c25a1d0ea4aed38af5f05672ce7c5':
Skip TimaKeyStore in KeyStoreTest
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions