diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:25:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:25:51 +0000 |
| commit | e208acefa553ec5f1e500dfdb4d78031fb76fb98 (patch) | |
| tree | daafacf347dfd0335da1c31b46fd4067be8a26a6 /annotations/generate_annotated_java_files.py | |
| parent | 6ae6451054ba5b9f7d143fe32bc93cc4f6a35a68 (diff) | |
| parent | 0e0e464b2251d235ee6710f9f87dc137ad60fa4f (diff) | |
Merge "Merge "DO NOT MERGE: Add tests for security vulnerability CVE-2016-0718" into lollipop-mr1-cts-dev am: a1203713c8 -s ours" into marshmallow-cts-dev am: f7b941eac6 -s ours am: 9e2781a5f3 am: baa2356fd9
am: 0e0e464b22
Change-Id: I1abf69adcdefe6c51b06a0cbab8b8461ee3c1c56
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions