summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Dooley <mdooley@google.com>2016-09-15 16:13:38 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2016-09-15 16:13:38 +0000
commit3051301802272b42af57d110af75ae4f2b48ca58 (patch)
tree8b78e5b0b20c5ea78ce8b93eaaffcd929a65e97c
parent7992aa442a7bb4f629d478d597af4265370fa985 (diff)
parent64c385e9e481232117db4f81ccd6c47074799f01 (diff)
downloadandroid_packages_apps_CarrierConfig-3051301802272b42af57d110af75ae4f2b48ca58.tar.gz
android_packages_apps_CarrierConfig-3051301802272b42af57d110af75ae4f2b48ca58.tar.bz2
android_packages_apps_CarrierConfig-3051301802272b42af57d110af75ae4f2b48ca58.zip
Merge "Adding a config to hide the conference 'swap' button for USCC" into nyc-mr1-dev
-rw-r--r--assets/carrier_config_311580.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/carrier_config_311580.xml b/assets/carrier_config_311580.xml
index 611fbf2..0416ec7 100644
--- a/assets/carrier_config_311580.xml
+++ b/assets/carrier_config_311580.xml
@@ -18,5 +18,6 @@
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="false" />
<boolean name="show_apn_setting_cdma_bool" value="true" />
+<boolean name="support_swap_after_merge_bool" value="false" />
</carrier_config>
</carrier_config_list>