diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:02:43 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:02:43 +0000 |
| commit | 9e2781a5f3992545feabd0e312548dffbc978ff1 (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | 5bc2c948ea08a81e3dc4f55796d6f6ac8425f307 (diff) | |
| parent | f7b941eac65b09c747f16fdcdb60a15e65a1b614 (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
Change-Id: I41b30b0a99f562f9586665506208fa0775e503f5
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions