tree e58fb5b904370936ff27db8d3d74df9df0c7da66
parent 6c0c4e8f948886758de985976d4a57e53133cc9c
parent a387eda4d4599d56ace78b031eab05b7095396a3
author Satya Tangirala <satyat@google.com> 1620946731 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620946731 +0000

Merge "Fix bug with deferred commits for key upgrades in temporary directories" am: 54ebfb5806 am: 38c07b96a1 am: a387eda4d4

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

Change-Id: I25a94c70abac50c65c1d04215bd58995e73f72ff