diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:25:35 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:25:35 +0000 |
| commit | 6ae6451054ba5b9f7d143fe32bc93cc4f6a35a68 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | a0586f17365c25b523604fb9906fc748e7f949e1 (diff) | |
| parent | 0411cf0cf75b0e2d7460f960522e656ac70ccaa6 (diff) | |
Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713c8 -s ours am: d0ad57c66b -s ours am: 5bc2c948ea am: 4647890ca0
am: 0411cf0cf7
Change-Id: I52e09af2728d10de0e7b20a0d7ada6977f057d17
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions