diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:11:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:11:13 +0000 |
| commit | 7c33964fb1558830b8fe4191655e0df954b9a92d (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | 989cd11b35302ce06d1ba0cc59a8efb719f332e7 (diff) | |
| parent | fa86b79b19718db4fb361ee40c8008cd9cafdf06 (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 am: c764a66cb6
am: fa86b79b19 -s ours
Change-Id: Ie589b89c727470501715aa1efda931dd97f61432
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions