OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2fd2578 c42b5ef)
am c42b5ef1: (-s ours) am 0236e6b2: Fix the build.
authorBart Sears <bsears@google.com>
Thu, 27 Aug 2015 07:02:06 +0000 (07:02 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 07:02:06 +0000 (07:02 +0000)
* commit 'c42b5ef190a11d52387f4ebea979fc7f91fb35ac':


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