OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ea70d8d f04fe04)
Merge "resolve merge conflicts of b9d34b3 to master"
authorFan Zhang <zhfan@google.com>
Fri, 15 Jul 2016 23:06:24 +0000 (23:06 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 15 Jul 2016 23:06:25 +0000 (23:06 +0000)

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