diff options
| author | Brad Ebinger <breadley@google.com> | 2017-03-16 21:30:38 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-16 21:30:38 +0000 |
| commit | 426d48b6a34c2f6962eff02d3e404ff19bc217bb (patch) | |
| tree | 4dde7fbaa4cda2e7273d6032c9650aed4967d43f | |
| parent | eeea264eb1a54a3bfb9168bd4c8e8d0e7d6b8acd (diff) | |
| parent | b133a5bf728054885c9253adeb67fce7076d67cc (diff) | |
| download | android_packages_apps_CarrierConfig-426d48b6a34c2f6962eff02d3e404ff19bc217bb.tar.gz android_packages_apps_CarrierConfig-426d48b6a34c2f6962eff02d3e404ff19bc217bb.tar.bz2 android_packages_apps_CarrierConfig-426d48b6a34c2f6962eff02d3e404ff19bc217bb.zip | |
resolve merge conflicts of 7dc6b68 to stage-aosp-master
am: b133a5bf72
Change-Id: I2403974e34cb4193c4070c548f475b6ddd97ce30
| -rw-r--r-- | assets/carrier_config_44020.xml | 1 |
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> |