Merge "Checking LOADER_USAGE_STATS before enabling read logs." into rvc-dev am: 6ce90...

author Alex Buynytskyy <alexbuy@google.com>

Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)

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

Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)
author Alex Buynytskyy <alexbuy@google.com>
Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)
diff --cc VoldNativeService.cpp
Simple merge
diff --cc VoldNativeService.h
Simple merge
author	Alex Buynytskyy <alexbuy@google.com>
	Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)
committer	Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
	Thu, 2 Apr 2020 00:48:17 +0000 (00:48 +0000)
		1	2
VoldNativeService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VoldNativeService.h	patch \|	diff1 \|	diff2 \|	blob \| history