OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8aaffd9 a6de8f2)
resolve merge conflicts of 1081a15 to lmp-mr1-ub-dev am: 975879a18d am: dd1016c619...
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 22:39:52 +0000 (22:39 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 22:39:52 +0000 (22:39 +0000)
am: a6de8f20c7

Change-Id: I119a274dd1050c6d26b70c7fbfb5ea95662e2a83


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