| commit | b1270bc3692bb4e7cec26fac6db77e4fe4f0de7b | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:39:35 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:39:35 2016 +0000 |
| tree | dde621f1d0458b7f084220cacd2317a6909a3b79 | |
| parent | b48910dcb4711de717ec14340439cba763385001 [diff] | |
| parent | cee2c8c96504dd78e78740a09ede08ae8442dd22 [diff] |
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" into marshmallow-cts-dev am: 545f8b7a58 -s ours am: a59e8bf2a4 am: 1d25c97357 am: 9d56f68176 am: fd868c8087 -s ours am: f4eff1f346 am: cee2c8c965 Change-Id: I05aa9ccd0186d4a48b3b6e4435912c22f649b68f