diff options
| author | Tina Zhou <tinazh@google.com> | 2016-11-16 20:20:48 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-16 20:20:48 +0000 |
| commit | a558bce0e787cd85bf7f5594cd3cc1894832afd1 (patch) | |
| tree | 6599c2c072eb9b26d6ca9e7f068e59c8065a4831 /annotations/generate_annotated_java_files.py | |
| parent | b5ea639c0cfa2e9cfe4856cb07b5889e50271224 (diff) | |
| parent | bbbe07288749f05bc5021680374271f1a939d017 (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
am: bbbe072887
Change-Id: I7f58801d3d93a9339dbe2cfe8a96b1a918c577b3
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions