| commit | 8f4aa909d00bebd5936c8583aef27400fcfe7f69 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:32:08 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:32:08 2016 +0000 |
| tree | ef5186a36ab27a289b8458c713747b5653b55bc8 | |
| parent | ed864ace3bbba784734684f080eca46f5f05ff81 [diff] | |
| parent | c47189c93fbd8156d4dc048ae920ae21aa46a9da [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 Change-Id: I4dcfa78f6f4cb57134a27e4f21ec061280cc5d95