OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8abcfb1 5c7fe15)
Merge "resolve merge conflicts of a2640b6f5142697162d4f02b4134e78b268f4a4b to pi...
authordimitry <dimitry@google.com>
Tue, 27 Mar 2018 19:19:24 +0000 (19:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Mar 2018 19:19:24 +0000 (19:19 +0000)
am: 5c7fe1524e

Change-Id: I05de77d9b90d147bf1d6ee7f7ee19a049afddfa1


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