diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:55:24 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:55:24 +0000 |
| commit | 0b6e70967e8678ade03244c4e99bb6ebeb1c1ed6 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 56931e237de6e9c07bd2fae52ee4633d70557b63 (diff) | |
| parent | 104feb883c7c842fea2d56fd81179e2b8218aca3 (diff) | |
Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours am: 0ebc41e9ff -s ours" into marshmallow-cts-dev am: 13d31cf764 -s ours am: 2232cae089
am: 104feb883c
Change-Id: I871c8c82a93f3e9bda211968f402ff6ba205bd3c
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions