tree c214cca0f9e92bd641be385b56283da020aa3450
parent 545a13a5686c34c188862ac3b0ab27dc8acb0ac7
parent 54ebfb58066770a682ae0bb5b3124ebd87621ec7
author Satya Tangirala <satyat@google.com> 1620944813 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1620944813 +0000

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

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

Change-Id: I441e7684b9e35d168ef034456311e95c01e8b18b