Merge "Add one more config resource for contacts provider" into qt-dev

author Makoto Onuki <omakoto@google.com>

Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)

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

Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)
author Makoto Onuki <omakoto@google.com>
Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)
committer android-build-merger <android-build-merger@google.com>
Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
author	Makoto Onuki <omakoto@google.com>
	Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)
committer	android-build-merger <android-build-merger@google.com>
	Thu, 30 May 2019 20:56:03 +0000 (13:56 -0700)
		1	2
core/res/res/values/config.xml	patch \|	diff1 \|	diff2 \|	blob \| history
core/res/res/values/symbols.xml	patch \|	diff1 \|	diff2 \|	blob \| history