tree 236a2b97dd5775a505c60da48d73f3f7c8ebfb95
parent 2e2e1e243da22886913fd95a0ad6e263780f3390
parent 7737b6415977f1dc23cb4eb0d387131fe0825039
author Fan Zhang <zhfan@google.com> 1536793988 -0700
committer android-build-merger <android-build-merger@google.com> 1536793988 -0700

Merge "Changes on Settings UI for a better user experience"
am: 7737b64159

Change-Id: I591b6eac611109bd903c99f79ecd63d37ca59511