OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cab27fb 53726c0)
resolve merge conflicts of 53726c0bbfaf to nyc-mr1-dev-plus-aosp
authorAndreas Gampe <agampe@google.com>
Tue, 10 Jan 2017 23:12:18 +0000 (15:12 -0800)
committerAndreas Gampe <agampe@google.com>
Tue, 10 Jan 2017 23:12:18 +0000 (15:12 -0800)
Change-Id: Iddf65660f9ac1d66907c8a3d2a3d34d9f3f66d81


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