tree 3cbba5eb819d85429dfed3bc0d6f3440840531e1
parent c248576dad525c992521f4c539c6681ff099be34
parent 0f74bd4811c506269c2139a40af1f66e75871cd8
author Paul Crowley <paulcrowley@google.com> 1628719238 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1628719238 +0000

[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811 -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: Idcba5a41ce50b3c043a8b80b74d90de0aef50f18