OSDN Git Service

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

Change-Id: Icf81e5ce2bc02750d66b13feedfc098dd9374167


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