Merge "Add voip audio mode configuration for ims call"

author Tyler Gunn <tgunn@google.com>

Tue, 8 Nov 2016 18:37:42 +0000 (18:37 +0000)

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

Tue, 8 Nov 2016 18:37:42 +0000 (18:37 +0000)
author Tyler Gunn <tgunn@google.com>
Tue, 8 Nov 2016 18:37:42 +0000 (18:37 +0000)
committer android-build-merger <android-build-merger@google.com>
Tue, 8 Nov 2016 18:37:42 +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	Tyler Gunn <tgunn@google.com>
	Tue, 8 Nov 2016 18:37:42 +0000 (18:37 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Tue, 8 Nov 2016 18:37:42 +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