diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 19:26:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 19:26:52 +0000 |
| commit | 8330bfd9a9c633ea6cc8c16e4350fb8683a240da (patch) | |
| tree | 16645af7d82bae65fb435ff4a5fd279165d4579a /annotations/generate_annotated_java_files.py | |
| parent | 4db9c97708aec67e79d1827b9f85604a43cd9ef9 (diff) | |
| parent | 4af2cb0aefced417b002ade9728b9bc53b9f5112 (diff) | |
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
am: 4af2cb0aef -s ours
Change-Id: Ib7546e3bbb5e011404aeceae19dc41de9190e250
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions