tree 656c1179d649fe41672fcd65ed0e02e667ac653a
parent 5a9feb48fab12ef9753cace44793a0b42c788b93
parent 91e4f1dd76ec9ca1d76ec52033bea5a0a2c20fb9
author Eric Biggers <ebiggers@google.com> 1604517305 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1604517305 +0000

Merge changes from topic "encryptinplace-cleanup" am: 91e4f1dd76

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

Change-Id: I50e47bd1cb102b9013542b0676258a79ac44b6b1