diff options
| author | Jordan Liu <jminjie@google.com> | 2016-11-10 03:24:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-11-10 03:24:20 +0000 |
| commit | e066d88c629dc54cd55a5edc8bfac27c0a970966 (patch) | |
| tree | 99ec2716a02632babe2923fe3eaf1dc171c2b4a8 /assets | |
| parent | f129e47957dcf854a7afbe13a4e8ce36b6386f60 (diff) | |
| parent | 4c68ce45dbc9991517cb88c0c06e18dc0448cef0 (diff) | |
| download | android_packages_apps_CarrierConfig-e066d88c629dc54cd55a5edc8bfac27c0a970966.tar.gz android_packages_apps_CarrierConfig-e066d88c629dc54cd55a5edc8bfac27c0a970966.tar.bz2 android_packages_apps_CarrierConfig-e066d88c629dc54cd55a5edc8bfac27c0a970966.zip | |
resolve merge conflicts of c524d8b to stage-aosp-master
am: 4c68ce45db
Change-Id: I35d383bc74d50481263573618834a1e7a4165b33
Diffstat (limited to 'assets')
| -rw-r--r-- | assets/carrier_config_20404.xml | 4 | ||||
| -rw-r--r-- | assets/carrier_config_311480.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/assets/carrier_config_20404.xml b/assets/carrier_config_20404.xml index a970698..66892da 100644 --- a/assets/carrier_config_20404.xml +++ b/assets/carrier_config_20404.xml @@ -32,6 +32,10 @@ <item value="dun" /> <item value="supl" /> </string-array> + <string-array name="dial_string_replace_string_array" num="2"> + <item value="*611:+19085594899" /> + <item value="*86:+1MDN" /> + </string-array> <string name="default_vm_number_string">*86</string> </carrier_config> </carrier_config_list> diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml index 1c484c2..fe7ebc9 100644 --- a/assets/carrier_config_311480.xml +++ b/assets/carrier_config_311480.xml @@ -80,6 +80,10 @@ <item value="dun" /> <item value="supl" /> </string-array> + <string-array name="dial_string_replace_string_array" num="2"> + <item value="*611:+19085594899" /> + <item value="*86:+1MDN" /> + </string-array> <string name="default_vm_number_string">*86</string> </carrier_config> </carrier_config_list> |