| commit | c47189c93fbd8156d4dc048ae920ae21aa46a9da | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:28:25 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:28:25 2016 +0000 |
| tree | 7edea8b6feeba8e03509ca1cc9744d4589c888b2 | |
| parent | bd8f704ac2011de9d5bb07e0d05e5ed5e2b79d94 [diff] | |
| parent | cbf05d421c2b07206a225576eb2813454ca5814d [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 Change-Id: Ic6201213bfca226c0bb8888db6caf20034015823