OSDN Git Service

am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 18:16:29 +0000 (18:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:16:29 +0000 (18:16 +0000)
commit38b84b6d765302c8325ad10109e43227ce8e8156
tree66ff52ee115640af182fa579937f382e3ec028a9
parent6a6bfe5e84b598f24d73138523d7f8d88729daed
parent60d7c9fcbcb80c556689f03c7b00984f94f9912b
am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad7: am 4a6ca672: Make Bitmap_createFromParcel check the color count. DO NOT MERGE

* commit '60d7c9fcbcb80c556689f03c7b00984f94f9912b':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE