diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:18:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:18:09 +0000 |
| commit | 0411cf0cf75b0e2d7460f960522e656ac70ccaa6 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | d79c2a0672818c11804fda4513858dac38c95356 (diff) | |
| parent | 4647890ca09a0fb9eb54621931609cad936c1f7e (diff) | |
Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713c8 -s ours am: d0ad57c66b -s ours am: 5bc2c948ea
am: 4647890ca0
Change-Id: I7472e63654463552dd7cc3b41aa776b4ca2c4956
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions