| commit | d9a69ff9765e9dd5ac00422ddb0f8eea4d1f9dcf | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:51:29 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:51:29 2016 +0000 |
| tree | d5a04c0e7460bbdfcd8dd47f77260afa7cbd1e3a | |
| parent | 8c90c01824a38905e5e056c0034d8ddb7ee0823d [diff] | |
| parent | 0ff9d982f09f64c3100cbe50c08f6316db18ffb1 [diff] |
Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386 -s ours" into lollipop-mr1-cts-dev am: 8f82f57c89 -s ours am: 1ab5f4ca14 -s ours am: eb35ad075f am: a1c45949f2 am: 7b81770d95 am: 74ed4b8011 -s ours am: 7a56f6b400 am: ae8b8c1778 am: db53275158 am: 0ff9d982f0 -s ours Change-Id: I60f5e67fa5ffbbce10c4b0389cb39787286daea9