OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bb1c5fd 46b7af5)
am 46b7af57: (-s ours) am d5a6df6d: Merge "Make the NullVibrator really null." into...
authorMichael Wright <michaelwr@google.com>
Thu, 27 Aug 2015 10:04:55 +0000 (10:04 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 10:04:55 +0000 (10:04 +0000)
* commit '46b7af57d7fd4354139801785a3eeb0579f4b6f9':


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