OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db1b3cf 1185eeb)
Merge "resolve merge conflicts of 9034b2717c88 to master"
authorAndreas Gampe <agampe@google.com>
Tue, 21 Mar 2017 19:37:32 +0000 (19:37 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 21 Mar 2017 19:37:38 +0000 (19:37 +0000)

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