commit f584d8bf50c2d6b1e934a1f5b3ba1001ead6e23d
author Daniel Xie <dxie@google.com> Thu May 19 17:55:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 19 17:55:06 2016 +0000
tree 2136efea536babe4be31f2632db8137d8ea15812
parent 958df5ce40942cc4f7fc475f5f2d356acc55d543
parent 9c3df0bb597f0d0a0710d04af774d82c980a287b

Merge "DO NOT MERGE: Revert "Revert "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 marshmallow-cts-dev
am: 9c3df0bb59  -s ours

* commit '9c3df0bb597f0d0a0710d04af774d82c980a287b':
  DO NOT MERGE: Revert "Revert "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: Ie77c6a22accf47bbe102e9098003f2c74c013d38