tree 9d7fd04d7ca2d4e846e28d4c7c2625f9b3036265
parent dd8b695c61c7630627d2ca60c8e21b12180a5ac4
parent 5acfc3e8d5082b79b7a7f93ce52e0d0a535e4226
author Eric Biggers <ebiggers@google.com> 1597083723 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597083723 +0000

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

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

Change-Id: I28615b8a9a656804b8ebacff0876e2acb1a64c1f