commit 69b840344d34b0f8710382f1a30d5e71dc5131f0
author Utsav Singh <utsavs@google.com> Mon May 23 18:45:27 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 18:45:27 2016 +0000
tree f956485d2d2f4a6563f93d867304108cbad362f6
parent adbf5e558204581e25bd09f2fad57791846c0afb
parent ea883af7fe8928a7e12399add24b1292577fd2a9

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

* commit 'ea883af7fe8928a7e12399add24b1292577fd2a9':
  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: I2df0cb415da8f042b010f5cb16e94cb2e291cb7b