diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:10:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:10:43 +0000 |
| commit | 34a0f67dda18ee82bb305e30a60417c91b698ac8 (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | e15380939ddd54e33dc822cd2cabc88821c02c14 (diff) | |
| parent | f19ac3490ffe623dd11549c689e71bbd21bc18bc (diff) | |
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours am: 0ebc41e9ff -s ours am: b569b494d4 -s ours am: d2a0d0135c am: 885d954321 am: 56931e237d
am: f19ac3490f -s ours
Change-Id: I2021774e934186f6e46fb240ab1d18e568baf4c4
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions