Merge "Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
am: e941740b35" into tm-d1-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
0366a838e7