Merge "vold: Support aborting FUSE connections." into rvc-dev am: cbb69e548a am:...

author Martijn Coenen <maco@google.com>

Fri, 29 May 2020 16:15:12 +0000 (16:15 +0000)

committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Fri, 29 May 2020 16:15:12 +0000 (16:15 +0000)
author Martijn Coenen <maco@google.com>
Fri, 29 May 2020 16:15:12 +0000 (16:15 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 29 May 2020 16:15:12 +0000 (16:15 +0000)
diff --cc VoldNativeService.cpp
Simple merge
diff --cc VoldNativeService.h
Simple merge
author	Martijn Coenen <maco@google.com>
	Fri, 29 May 2020 16:15:12 +0000 (16:15 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Fri, 29 May 2020 16:15:12 +0000 (16:15 +0000)
		1	2
VoldNativeService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VoldNativeService.h	patch \|	diff1 \|	diff2 \|	blob \| history