tree b9055c95ff9150fd3454fe72cd19d8bb658bc075
parent bb92ff6591b450d35e6fe95eed60077288ceceff
parent 213dbe30a1b0cfaa45c4a5cef141b96e6ffce3b1
author Eric Biggers <ebiggers@google.com> 1597082697 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597082697 +0000

Merge "EncryptInPlace: ensure that backup superblocks get encrypted" am: 213dbe30a1

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/1385029

Change-Id: I29e6eab9571d4556883594049f4abc33d9ffa674