tree c75d35537496bdd8625034541d32671594f479f5
parent 60d7c9fcbcb80c556689f03c7b00984f94f9912b
parent 4c1f70db3dc37f818bdff09ec3e289b797acc397
author Leon Scroggins III <scroggo@google.com> 1429898097 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429898097 +0000

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

* commit '4c1f70db3dc37f818bdff09ec3e289b797acc397':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE