commit 23a54be0d7140ae9afb16c36b8ec6de328535950
author Utsav Singh <utsavs@google.com> Mon May 23 18:37:02 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon May 23 18:37:02 2016 +0000
tree 3d1fea0647889b17b44fb83bc28723b4f888f44b
parent ec06372b7b3e0196df3fe549872f87bdb74d2984
parent b0d4b6797de23450bd9c8c9edf5d7cd4831c7961

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

* commit 'b0d4b6797de23450bd9c8c9edf5d7cd4831c7961':
  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: If1057b6c0692a88b781fe56ed3f1da3391469c20