Merge "Replace old no-service resource with new one" into qt-r1-dev

author Pengquan Meng <mpq@google.com>

Tue, 2 Jul 2019 17:35:53 +0000 (17:35 +0000)

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

Tue, 2 Jul 2019 17:35:53 +0000 (17:35 +0000)
author Pengquan Meng <mpq@google.com>
Tue, 2 Jul 2019 17:35:53 +0000 (17:35 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 2 Jul 2019 17:35:53 +0000 (17:35 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Pengquan Meng <mpq@google.com>
	Tue, 2 Jul 2019 17:35:53 +0000 (17:35 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 2 Jul 2019 17:35:53 +0000 (17:35 +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