diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:55:59 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:55:59 +0000 |
| commit | 2698961f23a4528f9bf6126ad190de12b2b0f8fd (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | c764a66cb60dda1083806765ebd5eaefa8b5fa20 (diff) | |
| parent | 3b52c8df653b6cb5bad61baaf3f0f4fcd05abf2d (diff) | |
Merge "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" into marshmallow-cts-dev am: 892b363638 -s ours am: 44b48556b4
am: 3b52c8df65
Change-Id: Ifaa112c3976c5326cbd9f87e1709499f42494110
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions