tree 41223f2833b3632017098e7f715145f709efb964
parent 5f8b47e6abdacb508128b7f3b2fee9be9a1cc29e
parent 4bb225bdb223784b8a9436df265c8966af4208bb
author Upendra <pupendra@google.com> 1468869123 +0000
committer android-build-merger <android-build-merger@google.com> 1468869123 +0000

Merge \\\\\\"Merge \\\\\\\"Merge \\\\\\\\"Merge \\\\\\\\\"DO NOT MERGE: This test verifies recursive decoding of malformed ICO file which should not lead to skia buffer overflow\\\\\\\\\" into kitkat-cts-dev am: 02c2dcc225  -s ours\\\\\\\\" into lollipop-cts-dev am: 48183e542b  -s ours\\\\\\\" into lollipop-mr1-cts-dev am: 1adca0d52b  -s ours\\\\\\" into marshmallow-cts-dev am: f0f9e5b49a  -s ours am: 59cd6a8449 am: 2e38a8d70e am: 1bfb039bbe am: 44809a17f7  -s ours
am: 4bb225bdb2

Change-Id: Ibb7986eb899766505d7388ee7290979309146601