Merge "Add device config to decide which Auto Selection Network UI to use."

author TreeHugger Robot <treehugger-gerrit@google.com>

Fri, 2 Mar 2018 18:37:59 +0000 (18:37 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Fri, 2 Mar 2018 18:37:59 +0000 (18:37 +0000)
author TreeHugger Robot <treehugger-gerrit@google.com>
Fri, 2 Mar 2018 18:37:59 +0000 (18:37 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Fri, 2 Mar 2018 18:37:59 +0000 (18:37 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	TreeHugger Robot <treehugger-gerrit@google.com>
	Fri, 2 Mar 2018 18:37:59 +0000 (18:37 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Fri, 2 Mar 2018 18:37:59 +0000 (18:37 +0000)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history