OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38cf068 67326bc)
am 67326bcb: am ea2dcda7: am ee35410f: (-s ours) am a7501119: am 69b8e962: Make Bitma...
authorLeon Scroggins III <scroggo@google.com>
Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 24 Apr 2015 17:15:55 +0000 (17:15 +0000)
* commit '67326bcba0f7287367dedba4caaf2a168a43f057':
  Make Bitmap_createFromParcel check the color count. DO NOT MERGE


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