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

[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 -s ours am: 2160b23d14 -s ours am: 94a55ae9c0 -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: Id10d467a12d7948a7421de7f45262f4dcfb91804