OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c697ffe 4c349b6)
Merge "resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am:...
authorAndroid Build Merger (Role) <android-build-merger@google.com>
Fri, 13 Jan 2017 21:26:25 +0000 (21:26 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 13 Jan 2017 21:26:28 +0000 (21:26 +0000)

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