diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:03:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:03:31 +0000 |
| commit | fa86b79b19718db4fb361ee40c8008cd9cafdf06 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 44d48629d9f197112da3b1d1610c92a2d809e075 (diff) | |
| parent | c764a66cb60dda1083806765ebd5eaefa8b5fa20 (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
Change-Id: Ic93ba3a14e1fd6bbf2bdaf4a6c91508fb7ac4e03
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions