diff options
| author | Paul Duffin <paulduffin@google.com> | 2016-11-16 20:19:27 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:19:27 +0000 |
| commit | ba2c19051ba50485541c3766a4b686f56e73667e (patch) | |
| tree | 6599c2c072eb9b26d6ca9e7f068e59c8065a4831 /annotations/generate_annotated_java_files.py | |
| parent | 6a0a19c923e6f5b19751ffbb5a32f1cfd45c2453 (diff) | |
| parent | e6fc889eb00cbbbb4dad1a830d77d452ae0c5aa7 (diff) | |
Merge "DO NOT MERGE Add tests for security vulnerability CVE-2016-0718 am: a7b6585471 -s ours" into lollipop-mr1-cts-dev am: 34d44271a8 -s ours am: f1f200fd76 -s ours am: d376458d25 am: 915d70d050 am: 01b07f7e90 am: d202b0fdad -s ours
am: e6fc889eb0
Change-Id: Ifb52bf505d7a7ecd5e85afcd185bcc42fb4972c3
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions