commit 4e221a4b852e0a4d42f1b6625057f0b9235b84fa
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 09 00:34:21 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 09 00:34:22 2017 +0000
tree 3c05df7cc85373bf650647c36e42003292c3122c
parent 99e5666d2a27ea85395f4f24f6a5f5c133ed1f32
parent e10949f478098374ac5d4c635e046e10abd37c2a

Merge "Fix bad merge conflict resolution in oc-dev by ag/2040324" into oc-dev

assets/carrier_config_20801.xml

diff --git a/assets/carrier_config_20801.xml b/assets/carrier_config_20801.xml
index cb4a6ad..7fd4c25 100644
--- a/assets/carrier_config_20801.xml
+++ b/assets/carrier_config_20801.xml
@@ -7,5 +7,6 @@
 <string-array name="carrier_vvm_package_name_string_array" num="1">
 <item value="com.orange.vvm"/>
 </string-array>
+<boolean name="allow_ussd_requests_via_telephony_manager_bool" value="false" />
 </carrier_config>
 </carrier_config_list>

assets/carrier_config_20802.xml

diff --git a/assets/carrier_config_20802.xml b/assets/carrier_config_20802.xml
index 3503a32..252620e 100644
--- a/assets/carrier_config_20802.xml
+++ b/assets/carrier_config_20802.xml
@@ -4,5 +4,6 @@
 <string-array name="carrier_vvm_package_name_string_array" num="1">
 <item value="com.orange.vvm"/>
 </string-array>
+<boolean name="allow_ussd_requests_via_telephony_manager_bool" value="false" />
 </carrier_config>
 </carrier_config_list>