diff options
| author | Daniel Xie <dxie@google.com> | 2015-07-31 23:38:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-07-31 23:38:06 +0000 |
| commit | 91994f09dce81de7b307aa88ce3c1c56cb0c7683 (patch) | |
| tree | 6ccbb06274c0e5ab0d2e7bdf6f43613478b61ae2 /annotations/generate_annotated_java_files.py | |
| parent | c25d8adf4bc85882d0f18858db3724039e5affa5 (diff) | |
| parent | 8a012b3a3ce662370beef99a02a4c353edd66c6b (diff) | |
Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
automerge: 8a012b3 -s ours
* commit '8a012b3a3ce662370beef99a02a4c353edd66c6b':
DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions