OSDN Git Service

am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromParcel check...
authorLeon Scroggins III <scroggo@google.com>
Thu, 23 Apr 2015 16:29:22 +0000 (16:29 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Apr 2015 16:29:22 +0000 (16:29 +0000)
commitea2dcda788e035ccdc55ab16303c9e34740a3f8c
tree4114f8712ae25f97d08389ad5c66629dabefd049
parent4a6ca6724c789603626d74a8cc187365788a6cfd
parentee35410ff8297b1ab39f3e546ebcedc27300a7de
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