OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 08a7c50 fddbcd8)
am fddbcd85: (-s ours) am 8be18bbf: am 4c1f70db: am b3523d7f: am 41c458c8: am 67326bc...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 18:22:00 +0000 (18:22 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 18:22:00 +0000 (18:22 +0000)
* commit 'fddbcd857fda28213917ef81375514bffc4a6d68':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE


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