OSDN Git Service

(root) / android-x86 / system-vold.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dfd0492 ddb542f)
resolve merge conflicts of 4ad7784 to stage-aosp-master
authorPaul Crowley <paulcrowley@google.com>
Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 28 Jun 2017 22:45:50 +0000 (22:45 +0000)
am: ddb542f574

Change-Id: Iedef223a14b8a0c8dc558440b429a33d6b23f948


Trivial merge
system/vold
About OSDN
Find Software
Develop Software
Help