OSDN Git Service

am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitma...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)
commit41c458c81125fb6e3fc9eb5304f0d3216a0a2d74
tree2ec4181e373c36426542590a83d3c2d3426ee85c
parent38cf068c04e1ce244529b95f6cc6d7d6a88fab24
parent67326bcba0f7287367dedba4caaf2a168a43f057
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