OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 36246a4 00e1e39)
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619...
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: 00e1e39ae2

Change-Id: I23587e80ea85f66e872e8bf0a9b1f83399c3b6fc


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