OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5837e31 9eae838)
Merge "resolve merge conflicts of 383cc530492e to master"
authorSelim Cinek <cinek@google.com>
Thu, 8 Jun 2017 02:31:44 +0000 (02:31 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 8 Jun 2017 02:31:49 +0000 (02:31 +0000)

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