tree 3cbba5eb819d85429dfed3bc0d6f3440840531e1
parent 56dd59424c24a94dd5bb12537b4a973b71b66b1e
parent 62b8b5c7a5b3ca4f24c296d68080d7842bef8a27
author Paul Crowley <paulcrowley@google.com> 1628721057 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628721057 +0000

[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 am: e00101c162 am: 62b8b5c7a5 -s ours

am skip reason: Merged-In I9c5c547140e8b1bbffb9c1d215f75251f0f1354e with SHA-1 1e6a5f5106 is already in history

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

Change-Id: I2ff7002e03c294dd036d524d83f7d63b7728748f