OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1db13a9 38b84b6)
am 38b84b6d: (-s ours) am 60d7c9fc: am 6db29a92: am f828f43f: am 38cf068c: am 16ac8ad...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 18:21:53 +0000 (18:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:21:53 +0000 (18:21 +0000)
* commit '38b84b6d765302c8325ad10109e43227ce8e8156':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help