diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 18:54:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 18:54:44 +0000 |
| commit | f7b941eac65b09c747f16fdcdb60a15e65a1b614 (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | 21446c3a0a35b0445f3e9aafca899f6455f658b5 (diff) | |
| parent | d0ad57c66b8a0587ae012ace9438c157dfeaa53c (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
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions