tree 3c9052062bd00e64eb5b93161e41e7a120897adc
parent 003db19a7819357060ff567d0f503ede58139254
parent 20f25192a072e32567b35992efeaed0598cf1030
author Daniel Xie <dxie@google.com> 1470850437 +0000
committer android-build-merger <android-build-merger@google.com> 1470850437 +0000

Merge "Revert "DO NOT MERGE: CTS test case for CVE-2015-1530"" into lollipop-cts-dev am: c4b650a386  -s ours am: ded865b135  -s ours am: a28d3c3383  -s ours am: 303d2b7490 am: cd04a25c4b am: 23cb596000 am: 62e9852c06  -s ours
am: 20f25192a0

Change-Id: Id3141cc442686502ebc417a517c42e2c382c726e