diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:12:19 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:12:19 +0000 |
| commit | baa2356fd9640b10ed4eeedb5104d8200945c053 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 4647890ca09a0fb9eb54621931609cad936c1f7e (diff) | |
| parent | 9e2781a5f3992545feabd0e312548dffbc978ff1 (diff) | |
Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713c8 -s ours" into marshmallow-cts-dev am: f7b941eac6 -s ours
am: 9e2781a5f3
Change-Id: Ia8ea9878dd17d382a13917f8a2097663816cb9e2
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions