OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: cf6a6d2)
resolve merge conflicts of 6df58d8da10d to oc-dr1-dev
authorfionaxu <fionaxu@google.com>
Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 18 Sep 2017 18:12:24 +0000 (18:12 +0000)
am: 6e40562a73  -s ours

Change-Id: I65b0adc062d2bfc83590b24d04030d01790e5bd7


No differences found
frameworks/base
About OSDN
Find Software
Develop Software
Help