OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 39ca5c2 ce13079)
Merge "resolve merge conflicts of 20ebbb3 to nyc-dev" into nyc-dev
authorPavel Zhamaitsiak <pavelz@google.com>
Tue, 5 Apr 2016 04:29:11 +0000 (04:29 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 5 Apr 2016 04:29:12 +0000 (04:29 +0000)

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