diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:10:58 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:10:58 +0000 |
| commit | 989cd11b35302ce06d1ba0cc59a8efb719f332e7 (patch) | |
| tree | b5c1d8772d3f36a01fe5cd29ffe58338115080fd /annotations/generate_annotated_java_files.py | |
| parent | 34a0f67dda18ee82bb305e30a60417c91b698ac8 (diff) | |
| parent | 44d48629d9f197112da3b1d1610c92a2d809e075 (diff) | |
Merge "Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718" into lollipop-cts-dev am: 11e21252eb -s ours am: 0ebc41e9ff -s ours" into marshmallow-cts-dev am: 13d31cf764 -s ours am: 2232cae089 am: 104feb883c am: 0b6e70967e
am: 44d48629d9 -s ours
Change-Id: I3e5dce4d49647458a10a18cb687db32e4a534904
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions