OSDN Git Service

am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 17:32:59 +0000 (17:32 +0000)
* commit '38cf068c04e1ce244529b95f6cc6d7d6a88fab24':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE


Trivial merge