diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:17:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:17:36 +0000 |
| commit | b569b494d4242ccee073e6d106d602ea3f28ff7b (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | f1f200fd763e7fc359b4876d2175585094bcbc49 (diff) | |
| parent | 0ebc41e9ff0a5c7ccd8829e1fc543ef8fac53454 (diff) | |
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours
am: 0ebc41e9ff -s ours
Change-Id: I8b3882ede7fa130b049b24984a5d5f25716ef97c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions