diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:20:00 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:20:00 +0000 |
| commit | 6c37e93af053e56f2921efe3e9357a76ac5b648f (patch) | |
| tree | 6599c2c072eb9b26d6ca9e7f068e59c8065a4831 /annotations/generate_annotated_java_files.py | |
| parent | 39c82dbdfa9a0addb122a06a97c76378ec9a6a7b (diff) | |
| parent | 34a0f67dda18ee82bb305e30a60417c91b698ac8 (diff) | |
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours am: 0ebc41e9ff -s ours am: b569b494d4 -s ours am: d2a0d0135c am: 885d954321 am: 56931e237d am: f19ac3490f -s ours
am: 34a0f67dda
Change-Id: I0fbfd0f6fe04c188bd534c9fc1e576d15dbffaf9
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions