OSDN Git Service

Merge "Revert^2 "Detect factory reset and deleteAllKeys"" into sc-dev am: 1566a5bf00
authorPaul Crowley <paulcrowley@google.com>
Fri, 13 Aug 2021 02:46:44 +0000 (02:46 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Fri, 13 Aug 2021 02:46:44 +0000 (02:46 +0000)
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15547746

Change-Id: I89bdf3d65c2461f882d39089e64961537888955b


Trivial merge