diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:26:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:26:54 +0000 |
| commit | 931215c55369baf56c5e8d86a3202d51b61c3415 (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /annotations/generate_annotated_java_files.py | |
| parent | 8330bfd9a9c633ea6cc8c16e4350fb8683a240da (diff) | |
| parent | 892b3636388a8f3ec85d57fc9592afeb367c4d66 (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
Change-Id: I76380c331727dd2786526cf2f8d8189bab6319ef
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions