am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '67326bcba0f7287367dedba4caaf2a168a43f057':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE
This commit is contained in:
Leon Scroggins III
2015-04-24 17:15:55 +00:00
committed by Android Git Automerger

Diff Content Not Available