OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6cae189 794bcd2)
Merge "resolve merge conflicts of be23ef368f1a to oc-dev-plus-aosp" into oc-dev-plus...
authorDaniel Sandler <dsandler@android.com>
Tue, 6 Jun 2017 22:53:00 +0000 (22:53 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 6 Jun 2017 22:53:07 +0000 (22:53 +0000)

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