| commit | 38a3681480fd5351fc11adde84de9aadced7ce5a | [log] [tgz] |
|---|---|---|
| author | Daniel Xie <dxie@google.com> | Thu Sep 01 06:40:36 2016 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Sep 01 06:40:36 2016 +0000 |
| tree | a538ee1d4eb286d50980685163fa6b0559c90e3b | |
| parent | 45bb94c8d1eac6efa40bba3770523f6d6555ded8 [diff] | |
| parent | b8cc188c051eb7cd2267571aa0ffcba102cf4162 [diff] |
Merge "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" into nougat-cts-dev am: 8153a8e53f -s ours am: c7d63882c1 am: b12be9a7b8 am: 5aae38f78a am: df7473d6cf am: b8cc188c05 -s ours Change-Id: I9c9dbff1243fe22b3a56788712b5e7bf43dea7d6