Merge "Check if storage app data and obb directories exist in vold" am: 168893621b...

author rickywai <rickywai@google.com>

Mon, 14 Dec 2020 14:59:49 +0000 (14:59 +0000)

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

Mon, 14 Dec 2020 14:59:49 +0000 (14:59 +0000)
author rickywai <rickywai@google.com>
Mon, 14 Dec 2020 14:59:49 +0000 (14:59 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Mon, 14 Dec 2020 14:59:49 +0000 (14:59 +0000)
diff --cc VoldNativeService.cpp
Simple merge
diff --cc VolumeManager.cpp
Simple merge
diff --cc VolumeManager.h
Simple merge
author	rickywai <rickywai@google.com>
	Mon, 14 Dec 2020 14:59:49 +0000 (14:59 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Mon, 14 Dec 2020 14:59:49 +0000 (14:59 +0000)
		1	2
VoldNativeService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VolumeManager.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VolumeManager.h	patch \|	diff1 \|	diff2 \|	blob \| history