| commit | 1704ffe3321e5fb1fb31b5ab5f91c6b8d1f99d19 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:16:38 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:16:38 2016 +0000 |
| tree | 18df575ca12fd0271e02f8ce5f39abe76af0ff85 | |
| parent | a95d472a0f910eb3d47b9ad586a92c3e6e614a12 [diff] | |
| parent | 8017e5b753f6d372d5345d01deaea27fd6a8a354 [diff] |
Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530" am: 480a3a5017 -s ours" into lollipop-mr1-cts-dev am: d105326d78 -s ours" into marshmallow-cts-dev am: c6d2869330 -s ours am: 4c9eeb8caf am: 8017e5b753 Change-Id: Ib0cf9476cc232a23e8676c37304d65efb4402f01