OSDN Git Service

am 8be18bbf: am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bcb: am ea2dcda7: am...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 18:16:34 +0000 (18:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:16:34 +0000 (18:16 +0000)
commitfddbcd857fda28213917ef81375514bffc4a6d68
tree66ff52ee115640af182fa579937f382e3ec028a9
parent38b84b6d765302c8325ad10109e43227ce8e8156
parent8be18bbfc23b768ae3022f988e586871754958ac
am 8be18bbf: 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 '8be18bbfc23b768ae3022f988e586871754958ac':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE