diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:34:14 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:34:14 +0000 |
| commit | 07d41c373e48553a608129a66a8b1a93427a5ce1 (patch) | |
| tree | ce25c28163ad9d9ea9809cdbae0ce097ea5bc07c /annotations/generate_annotated_java_files.py | |
| parent | 2232cae0890f71e5d105ff7b00c263e4aa0e6260 (diff) | |
| parent | 4af2cb0aefced417b002ade9728b9bc53b9f5112 (diff) | |
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
am: 4af2cb0aef -s ours
Change-Id: I2a4a5ca2c1c2e78ee2d5bf25160417199dd6d2cb
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions