OSDN Git Service

Merge "Change factoryReset to succeed for Settings" into qt-dev
authorLorenzo Colitti <lorenzo@google.com>
Fri, 14 Jun 2019 04:49:22 +0000 (21:49 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Jun 2019 04:49:22 +0000 (21:49 -0700)
am: 7fc7f9ce22

Change-Id: Iaec2ead1a4ba9a947d00d4dd92a303889b16147d


Trivial merge