diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:17:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:17:31 +0000 |
| commit | 41b9bcacc92e55efe8d985df2f65cf69de56fb86 (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | 3f09914e3d54835f7596bce823a9927ee5b47949 (diff) | |
| parent | f1f200fd763e7fc359b4876d2175585094bcbc49 (diff) | |
Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b6585471 -s ours" into lollipop-mr1-cts-dev am: 34d44271a8 -s ours" into marshmallow-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions