| commit | 92f956e3a58a73574b10edd6c5d74046776c72f2 | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Wed Aug 10 17:42:41 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Aug 10 17:42:41 2016 +0000 |
| tree | dde621f1d0458b7f084220cacd2317a6909a3b79 | |
| parent | aa9a3e1d7898057ac0ac41eccaa5cd4ca390e299 [diff] | |
| parent | f0fce3964fa5871094cd108e151f422c1b5ed072 [diff] |
Merge "Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386 -s ours am: ded865b135 -s ours" into marshmallow-cts-dev am: 545f8b7a58 -s ours am: a59e8bf2a4 am: 1d25c97357 am: 9d56f68176 am: fd868c8087 -s ours am: f4eff1f346 am: e8db1bc0cc am: f0fce3964f Change-Id: If8583fb0ead252575bb6b98698280d30a9f90ee9