tree 7f604f4e7ceb5560997ecd181cf9b62684dcd055
parent 9eb4ac8427c1413bcc7e1e6b017d8cc5dc3329f4
parent 1e0cdac6205abd103607173e48c66c3b145261ac
author Eric Biggers <ebiggers@google.com> 1620767875 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620767875 +0000

Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23837e am: 03e021ba56 am: 9d7718cf05 am: 1e0cdac620

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

Change-Id: I3c73357c29bc6f598bd15b36b3af59f12edaf38e