diff options
| author | Jordan Liu <jminjie@google.com> | 2016-10-26 11:31:22 -0700 |
|---|---|---|
| committer | Jordan Liu <jminjie@google.com> | 2016-10-26 11:31:22 -0700 |
| commit | 87fc790e274bc4c09dd48c364936d75dfd671abb (patch) | |
| tree | 8de57d584ef12dc10a9ba7326a15dcf76de46594 /assets/carrier_config_311480.xml | |
| parent | b949798141e22de38947c7748bb55060fe5d68a6 (diff) | |
| parent | 930462e09fe56df3475990cf1ac6e18f71c1885c (diff) | |
| download | android_packages_apps_CarrierConfig-87fc790e274bc4c09dd48c364936d75dfd671abb.tar.gz android_packages_apps_CarrierConfig-87fc790e274bc4c09dd48c364936d75dfd671abb.tar.bz2 android_packages_apps_CarrierConfig-87fc790e274bc4c09dd48c364936d75dfd671abb.zip | |
resolve merge conflicts of 930462e to stage-aosp-master
Change-Id: Ie6df326868e66e96a8d566bad72a2ba93840080e
Diffstat (limited to 'assets/carrier_config_311480.xml')
| -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 2580fb9..1c484c2 100644 --- a/assets/carrier_config_311480.xml +++ b/assets/carrier_config_311480.xml @@ -80,5 +80,6 @@ <item value="dun" /> <item value="supl" /> </string-array> + <string name="default_vm_number_string">*86</string> </carrier_config> </carrier_config_list> |