diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:47:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:47:37 +0000 |
| commit | 885d9543212ad9d88e2ca8808e8055bbe99b75db (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | ff4b6e95d4797749119a01d9dc334b5cce5b7793 (diff) | |
| parent | d2a0d0135c487ea27b52a55169435f00856ba618 (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
Change-Id: I9b0ff56ecd1d12e9170fa483c2687140ff52ea84
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions