commit | 7a56f6b400c8133e13b48da7e60324764d1a8581 | [log] [tgz] |
---|---|---|
author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:29:54 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:29:54 2016 +0000 |
tree | 7edea8b6feeba8e03509ca1cc9744d4589c888b2 | |
parent | f4eff1f3460d6e3b6ea5de31e8765878d48392cb [diff] | |
parent | 74ed4b80118aedbab42990ea206f44bbbc2125e3 [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 Change-Id: I0df7da73103e0baa81c8c50b8fc3d9dccb2c7d6e