commit 4e1d52ace4c38565fe686f5434bae076a3d45191
author Utsav Singh <utsavs@google.com> Mon May 23 19:16:51 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 19:16:51 2016 +0000
tree 3ec117701c4fc0bc123a61ee2b2398a5ffb0ce1e
parent 93f17b72856dff15939237b6db8c41a308457c3d
parent 0a5589fd072164947f57b1641105d937a943753f

Merge "Merge "Merge "DO NOT MERGE: This test case tries to decode a corrupt image file using BitmapFactory.decodeStream which causes Process crash on an unpatched device, thus failing the test." into lollipop-cts-dev am: b0d4b6797d  -s ours" into lollipop-mr1-cts-dev am: 04ec7def27  -s ours" into marshmallow-cts-dev am: ea883af7fe  -s ours am: 69b840344d am: f758bed62a am: 136d9d0c0e am: 2655db6a27  -s ours am: d449ee6262 am: 580a6886af
am: 0a5589fd07  -s ours

* commit '0a5589fd072164947f57b1641105d937a943753f':

Change-Id: I8461b0f97cad94784a130fd53068955b4d0221fe