OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db61e7e 0784828)
Merge "resolve merge conflicts of 490d397d284f to oc-dr1-dev" into oc-dr1-dev
authorPhil Weaver <pweaver@google.com>
Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 30 Aug 2017 22:54:59 +0000 (22:54 +0000)

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