summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorDaniel Xie <dxie@google.com>2015-07-22 00:32:36 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-07-22 00:32:36 +0000
commit8a012b3a3ce662370beef99a02a4c353edd66c6b (patch)
tree44709bd3a8f8b589ea9ca77bf09da8c462eceb18 /annotations/generate_annotated_java_files.py
parent977acac83f5c25a1d0ea4aed38af5f05672ce7c5 (diff)
parentc406d4ab6f64ea281ed33bebde86fc8defd0c64d (diff)
Merge "DO NOT MERGE ANYWHERE: reverting 18432707 to kitkat-cts-dev due to missing CVE" into kitkat-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions