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
This commit is contained in: