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:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-11-16 19:09:35 +0000
commit34d44271a869a3048bb95296193ba2d53c14be9b (patch)
treee6503f05ca69278a0237021a07cbbe2c922fc918 /annotations/generate_annotated_java_files.py
parenta1b430d8416c55144b8aa50ff996797064c74995 (diff)
parent557faae2aa90ebb615aa9d148fd6573ed961ed5e (diff)
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b6585471 -s ours" into lollipop-mr1-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions