OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2399b4 41a0dd4)
resolve merge conflicts of b4a5615 to lmp-dev am: 288166cbb2 am: b7f8b59e24
authorDavid Christie <dnchrist@google.com>
Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 Aug 2016 20:30:01 +0000 (20:30 +0000)
am: 41a0dd41f1

Change-Id: Ib74b0efa9b9345257d2b3ba59911baa324ec5801


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