am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE
* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c': Make Bitmap_createFromParcel check the color count. DO NOT MERGE
This commit is contained in: