tree 3cbba5eb819d85429dfed3bc0d6f3440840531e1
parent 94a55ae9c027403b065c8b8f2cd4fedb43114451
parent e00101c1625d1e67021c3e17b7abc32656a5ac41
author Paul Crowley <paulcrowley@google.com> 1628720204 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628720204 +0000

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

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

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

Change-Id: Ic2859085d504d98c16620f279ee4f820d0728248