diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:11:32 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:11:32 +0000 |
| commit | bbbe07288749f05bc5021680374271f1a939d017 (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | 7c33964fb1558830b8fe4191655e0df954b9a92d (diff) | |
| parent | 97adaa6921e6af0706e39005e77f15c18d948dae (diff) | |
Merge "Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours" into lollipop-mr1-cts-dev am: 142da70e99 -s ours" into marshmallow-cts-dev am: 892b363638 -s ours am: 44b48556b4 am: 3b52c8df65 am: 2698961f23
am: 97adaa6921 -s ours
Change-Id: Ic4613239033fdac1f95c610ae461fd568ab41220
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions