diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 18:54:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 18:54:31 +0000 |
| commit | d0ad57c66b8a0587ae012ace9438c157dfeaa53c (patch) | |
| tree | 5e28d18d73095dec6e43627dd603955309c91e63 /annotations/generate_annotated_java_files.py | |
| parent | 7dd7f6392e70a2fa4eb7e68a2d885e088ea8d3c7 (diff) | |
| parent | a1203713c85e6a6cf28ab73f4ff76c8a75096892 (diff) | |
Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev
am: a1203713c8 -s ours
Change-Id: Ia77de576971cb308de3d9318a4a6f6f8e87634dc
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions