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