diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:55:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:55:45 +0000 |
| commit | c764a66cb60dda1083806765ebd5eaefa8b5fa20 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 0b6e70967e8678ade03244c4e99bb6ebeb1c1ed6 (diff) | |
| parent | 050159649ef87bc703fbc8ff43d57fa93510ab04 (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 am: 142da70e99 -s ours am: 4af2cb0aef -s ours am: 07d41c373e
am: 050159649e
Change-Id: Ifd83d853f879e8ed83bff71e9c6d93f3ad6554dc
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions