diff options
| author | Android Merger <android-build-merger@google.com> | 2016-11-16 19:17:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-11-16 19:17:49 +0000 |
| commit | 892b3636388a8f3ec85d57fc9592afeb367c4d66 (patch) | |
| tree | 3670478a4ffbad48469ff0a538eb7fb7913bb3b2 /annotations/generate_annotated_java_files.py | |
| parent | 13d31cf76414ced7129c27ab96382511b13fefe6 (diff) | |
| parent | 4af2cb0aefced417b002ade9728b9bc53b9f5112 (diff) | |
Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours" into lollipop-mr1-cts-dev am: 142da70e99 -s ours" into marshmallow-cts-dev
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions