diff options
author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:12:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:12:05 +0000 |
commit | 4647890ca09a0fb9eb54621931609cad936c1f7e (patch) | |
tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
parent | 320139d38f41e9fecc6af48bbb4588971ba7910d (diff) | |
parent | 5bc2c948ea08a81e3dc4f55796d6f6ac8425f307 (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
Change-Id: I727da712986bdcb040905d9d191ede69342748df
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions