diff options
author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:55:08 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:55:08 +0000 |
commit | 56931e237de6e9c07bd2fae52ee4633d70557b63 (patch) | |
tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
parent | 96cb6c3aacd628e4768f97c3a2e724ffc6a88669 (diff) | |
parent | 885d9543212ad9d88e2ca8808e8055bbe99b75db (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
Change-Id: Ia5125d509335e99d22f0833ba442cba899158baf
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions