Merge "vold: add getUnlockedUsers() method to Binder interface" into sc-dev

author Eric Biggers <ebiggers@google.com>

Tue, 13 Apr 2021 17:52:02 +0000 (17:52 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 13 Apr 2021 17:52:02 +0000 (17:52 +0000)
author Eric Biggers <ebiggers@google.com>
Tue, 13 Apr 2021 17:52:02 +0000 (17:52 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 13 Apr 2021 17:52:02 +0000 (17:52 +0000)
diff --cc VoldNativeService.cpp
Simple merge
diff --cc VoldNativeService.h
Simple merge
diff --cc binder/android/os/IVold.aidl
Simple merge
author	Eric Biggers <ebiggers@google.com>
	Tue, 13 Apr 2021 17:52:02 +0000 (17:52 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 13 Apr 2021 17:52:02 +0000 (17:52 +0000)
		1	2
VoldNativeService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VoldNativeService.h	patch \|	diff1 \|	diff2 \|	blob \| history
binder/android/os/IVold.aidl	patch \|	diff1 \|	diff2 \|	blob \| history