[automerger skipped] Detect factory reset and deleteAllKeys am: 0f74bd4811
am: e00101c162
-s ours am: f54a94de16
-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: Ic88a0c3a362cc246aff5935cc07ac8849bb8ced1
This commit is contained in:
commit
1371b057d7