diff options
| author | Daniel Xie <dxie@google.com> | 2016-09-01 04:51:45 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-01 04:51:45 +0000 |
| commit | 20e5c935a4071ed66327253d4d9abdf71faa5776 (patch) | |
| tree | dcdb6b28599c069699f369916c65ff01f5affebb | |
| parent | 0238d3c563ebfb30166cba3079126350e10a8b47 (diff) | |
| parent | c301d8a72611e053d4c7ec2e6b0a6ab20c6c61fa (diff) | |
| download | cts-20e5c935a4071ed66327253d4d9abdf71faa5776.tar.gz | |
Merge "Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386 -s ours" into lollipop-mr1-cts-dev am: 8f82f57c89 -s ours am: 1ab5f4ca14 -s ours" into nougat-cts-dev am: a16d2940e6 -s ours
am: c301d8a726
Change-Id: I4e603bae0dfa1bee3166b755259cb1347b1fa63d
0 files changed, 0 insertions, 0 deletions