OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 16ac8ad ea2dcda)
am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitmap_createFromP...
authorLeon Scroggins III <scroggo@google.com>
Thu, 23 Apr 2015 16:41:49 +0000 (16:41 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 23 Apr 2015 16:41:49 +0000 (16:41 +0000)
* commit 'ea2dcda788e035ccdc55ab16303c9e34740a3f8c':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE


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