diff options
| author | Daniel Xie <dxie@google.com> | 2015-09-01 10:12:59 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-01 10:12:59 +0000 |
| commit | 0a0b179746fc0de0e6a32b77f66006044caf672b (patch) | |
| tree | 6770798b4a4f67f62a5450ac91c94dc8f51a197a /annotations/generate_annotated_java_files.py | |
| parent | c55b6a086bbac91c72fc7b72121db96c68e7f677 (diff) | |
| parent | 4822b351636758cab5df191f001a0c79971a6343 (diff) | |
am 4822b351: am 24a20484: am edef8836: am c25d8adf: Merge "Skip TimaKeyStore in KeyStoreTest" into kitkat-cts-dev automerge: 977acac
* commit '4822b351636758cab5df191f001a0c79971a6343':
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions