tree 1f42197a40170e9273686e4b93e8b41afebb6457
parent 24c57b6a70bd56f3c166ab56da42ec0a2fb5db27
parent 7fc7f9ce2211e161fc8f009302ded5a78daedd17
author Lorenzo Colitti <lorenzo@google.com> 1560487762 -0700
committer android-build-merger <android-build-merger@google.com> 1560487762 -0700

Merge "Change factoryReset to succeed for Settings" into qt-dev
am: 7fc7f9ce22

Change-Id: Iaec2ead1a4ba9a947d00d4dd92a303889b16147d