OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a9b0ecd 0c3c81e)
am 0c3c81ef: (-s ours) am af7748ef: Merge "Consider channel index masks when calculat...
authorPaul Mclean <pmclean@google.com>
Thu, 27 Aug 2015 10:05:59 +0000 (10:05 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:05:59 +0000 (10:05 +0000)
* commit '0c3c81ef037e89e67e7d0d7ccc176c12e6637184':


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