Merge "Remove old configuration values for demo mode" into oc-dr1-dev

author Christine Franks <christyfranks@google.com>

Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)

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

Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)
author Christine Franks <christyfranks@google.com>
Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Christine Franks <christyfranks@google.com>
	Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 25 Jul 2017 01:23:24 +0000 (01:23 +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