diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:20:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:20:33 +0000 |
| commit | b5ea639c0cfa2e9cfe4856cb07b5889e50271224 (patch) | |
| tree | 6599c2c072eb9b26d6ca9e7f068e59c8065a4831 /annotations/generate_annotated_java_files.py | |
| parent | abfc06cf803f4516bfa4acf4885ef994fba793d8 (diff) | |
| parent | 7c33964fb1558830b8fe4191655e0df954b9a92d (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 am: 07d41c373e am: 050159649e am: c764a66cb6 am: fa86b79b19 -s ours
am: 7c33964fb1
Change-Id: I28fec7d6125adf875102f8e815d35a0cf0baaf2a
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions