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