| commit | 6e9d3812b431bddc8221ea082249b6b5b7ce078c | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:37:56 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:37:56 2016 +0000 |
| tree | 933a0c2b8ce398642c8f3677654898d3c1a56ba0 | |
| parent | 518243892d28271eacfe3a252ea31a2db65d3d6d [diff] | |
| parent | 1ef9bcad32c84a32ee953dfdfab2ff9f2d0355f9 [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 am: e91c186dc7 -s ours am: bd8f704ac2 am: 1ef9bcad32 Change-Id: I7d837954cd318cb5fb5c691d07945aa5f6f03a98