OSDN Git Service

Merge "Revert "Detect factory reset and deleteAllKeys"" into sc-dev am: 90c818d9ee
authorShawn Willden <swillden@google.com>
Thu, 12 Aug 2021 01:33:01 +0000 (01:33 +0000)
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Thu, 12 Aug 2021 01:33:01 +0000 (01:33 +0000)
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/vold/+/15536478

Change-Id: Ie0847281b708c9eb06d54a7078fd6476e65a4099


Trivial merge