OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b04db40 619e5c8)
resolve merge conflicts of 6c7ef2e8d753 to stage-aosp-master
authorfionaxu <fionaxu@google.com>
Thu, 7 Sep 2017 08:15:48 +0000 (08:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 7 Sep 2017 08:15:48 +0000 (08:15 +0000)
am: 619e5c8ecc

Change-Id: Id0a086a966c121fa850bb1c8748f1565ef6d1b82


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