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

author Fan Zhang <zhfan@google.com>

Wed, 12 Sep 2018 23:52:35 +0000 (16:52 -0700)

committer android-build-merger <android-build-merger@google.com>

Wed, 12 Sep 2018 23:52:35 +0000 (16:52 -0700)
author Fan Zhang <zhfan@google.com>
Wed, 12 Sep 2018 23:52:35 +0000 (16:52 -0700)
committer android-build-merger <android-build-merger@google.com>
Wed, 12 Sep 2018 23:52:35 +0000 (16:52 -0700)
diff --cc res/layout/master_clear.xml
Simple merge
diff --cc res/values-sw600dp-land/dimens.xml
Simple merge
diff --cc res/values-sw600dp/dimens.xml
Simple merge
diff --cc res/values/dimens.xml
Simple merge
author	Fan Zhang <zhfan@google.com>
	Wed, 12 Sep 2018 23:52:35 +0000 (16:52 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Wed, 12 Sep 2018 23:52:35 +0000 (16:52 -0700)
		1	2
res/layout/master_clear.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values-sw600dp-land/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values-sw600dp/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/values/dimens.xml	patch \|	diff1 \|	diff2 \|	blob \| history