Merge "Make ext4 userdata checkpoints work with metadata encryption" am: 2c792e0720

author Paul Lawrence <paullawrence@google.com>

Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)

committer android-build-merger <android-build-merger@google.com>

Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)
author Paul Lawrence <paullawrence@google.com>
Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)
diff --cc Checkpoint.cpp
Simple merge
diff --cc VoldNativeService.cpp
Simple merge
diff --cc VoldNativeService.h
Simple merge
diff --cc binder/android/os/IVold.aidl
Simple merge
author	Paul Lawrence <paullawrence@google.com>
	Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 27 Jun 2019 18:03:03 +0000 (11:03 -0700)
		1	2
Checkpoint.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VoldNativeService.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
VoldNativeService.h	patch \|	diff1 \|	diff2 \|	blob \| history
binder/android/os/IVold.aidl	patch \|	diff1 \|	diff2 \|	blob \| history