commit d449ee6262e6ceabd3978facb41b1df82dbcb4df
author Utsav Singh <utsavs@google.com> Mon May 23 19:03:04 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 19:03:04 2016 +0000
tree 2895a9f4f0644786564a7812c886f822a81a7ab6
parent 5e54312e816eabf30795ebdc675d1df076ea1570
parent 2655db6a2773053ce2289057faebe271206ff5ed

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

* commit '2655db6a2773053ce2289057faebe271206ff5ed':
  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.

Change-Id: I7eb50217ecb393fa73a51b07224363bcc783128e