summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2017-03-16 13:07:52 -0700
committerBrad Ebinger <breadley@google.com>2017-03-16 13:07:52 -0700
commitb133a5bf728054885c9253adeb67fce7076d67cc (patch)
tree4dde7fbaa4cda2e7273d6032c9650aed4967d43f
parent8678afc939f75103166a30371c3ff088c1eb34a3 (diff)
parent7dc6b68dd3a68ac70dfbf2a70ebd0781e8a4b925 (diff)
downloadandroid_packages_apps_CarrierConfig-b133a5bf728054885c9253adeb67fce7076d67cc.tar.gz
android_packages_apps_CarrierConfig-b133a5bf728054885c9253adeb67fce7076d67cc.tar.bz2
android_packages_apps_CarrierConfig-b133a5bf728054885c9253adeb67fce7076d67cc.zip
resolve merge conflicts of 7dc6b68 to stage-aosp-master
Change-Id: I0b59622edbb40219da1313f6da9b8f72bf23c29d
-rw-r--r--assets/carrier_config_44020.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml
index 20ccb06..32e4a19 100644
--- a/assets/carrier_config_44020.xml
+++ b/assets/carrier_config_44020.xml
@@ -20,5 +20,6 @@
</string-array>
<string name="default_vm_number_string">1416</string>
<long name="message_expiration_time_long" value="3600000" />
+ <boolean name="ignore_data_enabled_changed_for_video_calls" value="true" />
</carrier_config>
</carrier_config_list>