tree 7590789648bb57c3b07a2c9a0a1a9c216ed66cb0
parent 0aba5c5b1e8ced969e2327dd0f994ab6d9dd9d42
parent c2d4f15907607d42c330aef4bbbefea5db04db5e
author Robert Shih <robertshih@google.com> 1487111525 +0000
committer android-build-merger <android-build-merger@google.com> 1487111525 +0000

Merge "Merge "DO NOT MERGE Add CTS test for CVE-2016-2429" into kitkat-cts-dev am: 532f593a9e  -s ours" into lollipop-cts-dev
am: c2d4f15907  -s ours

Change-Id: I77b02ea874607bcd2dc80e26f7739b21fd5ca239