Merge "Config change to not show swap button after merging calls into Cdma conference." into lmp-mr1-dev
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml
index 06c9ae5..d29eb83 100644
--- a/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml
+++ b/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml
@@ -33,6 +33,8 @@
<bool name="config_use_hfa_for_provisioning" translatable="false">true</bool>
<!-- Display carrier settings -->
<bool name="config_carrier_settings_enable">true</bool>
+ <!-- Don't display swap button after merging calls into Cdma conference. -->
+ <bool name="support_swap_after_merge">false</bool>
<!-- carrier settings menu -->
<string name="carrier_settings" translatable="false">com.android.sdm.plugins.sprintdm</string>
<string name="carrier_settings_menu" translatable="false">com.android.sdm.plugins.sprintdm.SprintCarrierSettingsActivity</string>
