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