| commit | e91c186dc7d643dc0f5ab18536e797791329c6ea | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:22:28 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:22:28 2016 +0000 |
| tree | 18df575ca12fd0271e02f8ce5f39abe76af0ff85 | |
| parent | 1836625cfe5b0224d8f24179fab3b0efb46334e9 [diff] | |
| parent | 4d0a08398577c74eb9a8e313cb48edcdc620dddf [diff] |
Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530" am: 480a3a5017 -s ours am: f22181e287 -s ours" into marshmallow-cts-dev am: d733badc5b -s ours am: acf6a3d370 am: 25d949ce1e am: 4d0a083985 Change-Id: I9952df9bb04072b6830f178df1e392db41e611e7