OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ff37ef 4c349b6)
resolve merge conflicts of ad4aa1ce7d3d to nyc-mr1-dev am: eb35ad9969 am: 3aac3ebee1...
authorAndrew Scull <ascull@google.com>
Sat, 14 Jan 2017 00:31:51 +0000 (00:31 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 14 Jan 2017 00:31:51 +0000 (00:31 +0000)
am: 4c349b67aa

Change-Id: I4718d7e2c73a5f84ca43789a09db5f3ab9a6b5d6


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