OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b420612 0f3e895)
Merge "resolve merge conflicts of 7829131 to nyc-dev" into nyc-dev
authorScott Main <smain@google.com>
Mon, 2 May 2016 21:11:28 +0000 (21:11 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 2 May 2016 21:11:30 +0000 (21:11 +0000)

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