diff options
| author | Jack Yu <jackyu@google.com> | 2016-11-23 20:22:39 -0800 |
|---|---|---|
| committer | Jack Yu <jackyu@google.com> | 2016-11-23 20:24:17 -0800 |
| commit | b9fa82d673c3b0f297b4341d251cc1874a182c66 (patch) | |
| tree | 1a39d71f8dbbb1159f6cc87ea05b59f082530eb6 /assets/carrier_config_44020.xml | |
| parent | 706ea110f37dbf148b5807e2be60f2bdf3f7c3c5 (diff) | |
| parent | 25fda5d7b2ae6a82e0cef92738dd89e9058b14fd (diff) | |
| download | android_packages_apps_CarrierConfig-b9fa82d673c3b0f297b4341d251cc1874a182c66.tar.gz android_packages_apps_CarrierConfig-b9fa82d673c3b0f297b4341d251cc1874a182c66.tar.bz2 android_packages_apps_CarrierConfig-b9fa82d673c3b0f297b4341d251cc1874a182c66.zip | |
resolve merge conflicts of 25fda5d to nyc-mr2-dev-plus-aosp
Test: None
Change-Id: Id94e4f193ce386c065474ab5731ad1fdefb38ac3
Diffstat (limited to 'assets/carrier_config_44020.xml')
| -rw-r--r-- | assets/carrier_config_44020.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/assets/carrier_config_44020.xml b/assets/carrier_config_44020.xml index 0414059..d931079 100644 --- a/assets/carrier_config_44020.xml +++ b/assets/carrier_config_44020.xml @@ -19,6 +19,5 @@ </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> |