diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:18:25 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:18:25 +0000 |
| commit | 0e0e464b2251d235ee6710f9f87dc137ad60fa4f (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 0411cf0cf75b0e2d7460f960522e656ac70ccaa6 (diff) | |
| parent | baa2356fd9640b10ed4eeedb5104d8200945c053 (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
am: baa2356fd9
Change-Id: I9e5a758de68ca30bc4f114e386384602156c5d91
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions