Merge "Migrate flag config_telephony_use_own_number_for_voicemail to Carrier Config...

author Cassie Han <xih@google.com>

Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)

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

Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)
author Cassie Han <xih@google.com>
Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)
committer android-build-merger <android-build-merger@google.com>
Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)
diff --cc core/res/res/values/config.xml
Simple merge
diff --cc core/res/res/values/symbols.xml
Simple merge
diff --cc telephony/java/android/telephony/CarrierConfigManager.java
Simple merge
author	Cassie Han <xih@google.com>
	Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +0000)
committer	android-build-merger <android-build-merger@google.com>
	Mon, 8 Jan 2018 21:28:02 +0000 (21:28 +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
telephony/java/android/telephony/CarrierConfigManager.java	patch \|	diff1 \|	diff2 \|	blob \| history