OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 942b04e 1a0bc03)
Merge "Merge "resolve merge conflicts of b9d266f to nyc-dev-plus-aosp" into nyc-dev...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Tue, 7 Jun 2016 18:04:20 +0000 (18:04 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 7 Jun 2016 18:04:22 +0000 (18:04 +0000)

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