summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad Ebinger <breadley@google.com>2017-03-16 21:34:09 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-03-16 21:34:09 +0000
commitaf91e34dcd558ff00a403de5f92abcdb7881eac4 (patch)
tree0ac144b316ed2b3cf149ffec3a6c3fc3ca1f591b
parentdf42e41f0e5c0dd16589876204b6fbedf1660203 (diff)
parent426d48b6a34c2f6962eff02d3e404ff19bc217bb (diff)
downloadandroid_packages_apps_CarrierConfig-af91e34dcd558ff00a403de5f92abcdb7881eac4.tar.gz
android_packages_apps_CarrierConfig-af91e34dcd558ff00a403de5f92abcdb7881eac4.tar.bz2
android_packages_apps_CarrierConfig-af91e34dcd558ff00a403de5f92abcdb7881eac4.zip
resolve merge conflicts of 7dc6b68 to stage-aosp-master am: b133a5bf72
am: 426d48b6a3 Change-Id: Ic4c6e9a84a004de2ae59aa970f742095164cbdd7
-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>