tree 31244fadb95227175a8f03477f6ac69cc10d34ef
parent 99fd2a4b5a3857a2a01f4550b4263f4e13ca674f
parent 2c792e072049783b49e5112120f3694ab80c4f0c
author Paul Lawrence <paullawrence@google.com> 1561657806 -0700
committer android-build-merger <android-build-merger@google.com> 1561657806 -0700

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

Change-Id: I1aed54ccf98fb73b29ed13fa971bbfbb25a489ae