OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 02e54d3 36246a4)
resolve merge conflicts of 8aaffd9 to nyc-dev
authorDavid Christie <dnchrist@google.com>
Thu, 25 Aug 2016 01:25:30 +0000 (01:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 25 Aug 2016 01:25:30 +0000 (01:25 +0000)
am: 36246a43e5

Change-Id: Ic91baff73ef9e5ffe304d10a5a55e8476dfcfecb


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