OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8ebd8a 7978147)
Merge "resolve merge conflicts of afed6f8 to nyc-dev" into nyc-dev
authorChen Xu <fionaxu@google.com>
Thu, 9 Jun 2016 02:32:51 +0000 (02:32 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Thu, 9 Jun 2016 02:32:52 +0000 (02:32 +0000)

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