| commit | 94d23b2cf6b48ad4431a845b76d377546cbda861 | [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 | 6e9d3812b431bddc8221ea082249b6b5b7ce078c [diff] | |
| parent | f8643940e31f8e558feb5c97d413c958b5f39c7d [diff] |
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 am: f062ffbf44 -s ours am: 76407fe7a5 am: b00f83f42a am: a95d472a0f am: cbf05d421c -s ours am: c47189c93f am: f8643940e3 Change-Id: I75a4a3cd6e95342323161f39460271aca0791a18