| commit | 6a228c0eb765628193e960bf114f69d56979bed9 | [log] [tgz] |
|---|---|---|
| author | Leon Scroggins III <scroggo@google.com> | Thu Apr 23 16:29:22 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Apr 23 16:29:22 2015 +0000 |
| tree | 809798e1d3fdcf1bf7e4962c45a73c111e694557 | |
| parent | 738d8a56cceb3f8d2f6ced4c043b014b1eb48f07 [diff] | |
| parent | 2cf6d52a3b5c4398667cd00361bff4440f6df82d [diff] |
am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE * commit 'ee35410ff8297b1ab39f3e546ebcedc27300a7de': Make Bitmap_createFromParcel check the color count. DO NOT MERGE