OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 76415ee 17b1c2c)
Merge "resolve merge conflicts of 7d1428d7f3 to master."
authorQiwen Zhao <zhao@google.com>
Thu, 19 Nov 2015 02:51:40 +0000 (02:51 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 19 Nov 2015 02:51:40 +0000 (02:51 +0000)

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