| commit | 48a835d4b40372ac144a415551da84c50c79cef7 | [log] [tgz] |
|---|---|---|
| author | Android Merger <android-build-merger@google.com> | Mon Jul 25 21:19:06 2016 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jul 25 21:19:06 2016 +0000 |
| tree | 86515489b316a5a43fb13036fe2a1b315a8516c5 | |
| parent | 9a60c35593d63accc479f0c5187753d99257f04b [diff] | |
| parent | 5b99bb16339cde674c00f53d4888b96770ebf3e8 [diff] |
Merge changes Ib24bf8f8,Ie77ff01f into marshmallow-cts-dev * changes: 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-mr1-cts-dev am: f27569cd6e -s ours 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. am: 29f4f75e4a -s ours