Merge "[Settings] Code refactor" am: a7a9863a52
am: a99bfeadf9
am: 6714c01dd6
Change-Id: Ifbc48adf4e12ff4b9fe3c009c04e7fd4f9312b83
This commit is contained in:
a7a9863a52
am: a99bfeadf9
am: 6714c01dd6
Change-Id: Ifbc48adf4e12ff4b9fe3c009c04e7fd4f9312b83