diff options
| author | Brad Ebinger <breadley@google.com> | 2016-12-19 12:50:18 -0800 |
|---|---|---|
| committer | Brad Ebinger <breadley@google.com> | 2016-12-19 12:50:18 -0800 |
| commit | 27aa8ec2fc3fd6f8deb6a5131a049e39ebf8a758 (patch) | |
| tree | f7a84674c03a8783d908ed85f7c83b0fc831ae03 /assets | |
| parent | 777c58d59b695551f452338d7e702d8379ba8014 (diff) | |
| parent | c8494c29a3f89afd936a37227cdd09e1a86f4962 (diff) | |
| download | android_packages_apps_CarrierConfig-27aa8ec2fc3fd6f8deb6a5131a049e39ebf8a758.tar.gz android_packages_apps_CarrierConfig-27aa8ec2fc3fd6f8deb6a5131a049e39ebf8a758.tar.bz2 android_packages_apps_CarrierConfig-27aa8ec2fc3fd6f8deb6a5131a049e39ebf8a758.zip | |
resolve merge conflicts of c8494c2 to nyc-mr2-dev-plus-aosp
Change-Id: I099c741d0365c9cd475e5a86ff963cdfe8046d5c
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/carrier_config_311480.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml index 611e3dc..c455268 100644 --- a/assets/carrier_config_311480.xml +++ b/assets/carrier_config_311480.xml @@ -86,5 +86,6 @@ <item value="*86:+1MDN" /> </string-array> <string name="default_vm_number_string">*86</string> + <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false" /> </carrier_config> </carrier_config_list> |