summaryrefslogtreecommitdiff
path: root/annotations/generate_annotated_java_files.py
diff options
context:
space:
mode:
authorAndroid Merger <android-build-merger@google.com>2016-11-16 19:09:39 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-11-16 19:09:40 +0000
commit142da70e99ef3515e560a162f81619f2a8bb4a51 (patch)
treee6503f05ca69278a0237021a07cbbe2c922fc918 /annotations/generate_annotated_java_files.py
parent34d44271a869a3048bb95296193ba2d53c14be9b (diff)
parent0ebc41e9ff0a5c7ccd8829e1fc543ef8fac53454 (diff)
Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours" into lollipop-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions