diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-12 04:06:50 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-12 04:06:50 +0000 |
| commit | 9b98f31fa9b7bcd7f46bfbb0d6281705904c6fe9 (patch) | |
| tree | 299434f810e5e249959f228350541098f1d84f92 /annotations/generate_annotated_java_files.py | |
| parent | 05b8a1b98dc6b85029776506eb07fe8c27c626c1 (diff) | |
| parent | 2ab5a4898ae61056b8eee8231f0761245dd93295 (diff) | |
am 2ab5a489: am 45101b8e: am 9f275caa: am 977acac8: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev
* commit '2ab5a4898ae61056b8eee8231f0761245dd93295':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions