diff options
| author | Daniel Xie <dxie@google.com> | 2016-09-01 04:51:36 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-09-01 04:51:36 +0000 |
| commit | 5eb2bc773f716568f1a69feabac64b12560bb307 (patch) | |
| tree | dcdb6b28599c069699f369916c65ff01f5affebb | |
| parent | db366e2bee5b9d4219ac31c2a37c6cdc67d1acd1 (diff) | |
| parent | b7140b271bdd14c2de2ece6d501c080e7427c799 (diff) | |
| download | cts-5eb2bc773f716568f1a69feabac64b12560bb307.tar.gz | |
Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386 -s ours am: ded865b135 -s ours am: a28d3c3383 -s ours" into nougat-cts-dev am: 84bedd9d3c -s ours
am: b7140b271b
Change-Id: I1a89729c23a7e774abe705c25d17c94e11615de0
0 files changed, 0 insertions, 0 deletions