OSDN Git Service

Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23837e...
authorEric Biggers <ebiggers@google.com>
Tue, 11 May 2021 21:04:02 +0000 (21:04 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Tue, 11 May 2021 21:04:02 +0000 (21:04 +0000)
commit1e0cdac6205abd103607173e48c66c3b145261ac
tree7f604f4e7ceb5560997ecd181cf9b62684dcd055
parent0ae52740907cdcf0bdbf023cddc5b4d6db92c046
parent9d7718cf055a4a7a31e39db55668450fc2bd53ec
Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23837e am: 03e021ba56 am: 9d7718cf05

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

Change-Id: Ice91b35eda0f09cbb9d4a4e500a1e9984940b0f1