Merge "Change factoryReset to succeed for Settings" am: c687700cde
am: 9d59a75463 Change-Id: I9b7ce285fc205255dd9e2e0fa71afd0f8392d243
This commit is contained in:
c687700cde
am: 9d59a75463 Change-Id: I9b7ce285fc205255dd9e2e0fa71afd0f8392d243