OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99a8e2f fd222fc)
Merge "resolve merge conflicts of 6cbf137 to master"
authorGustav Sennton <gsennton@google.com>
Fri, 17 Jun 2016 10:49:53 +0000 (10:49 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 17 Jun 2016 10:49:54 +0000 (10:49 +0000)

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