From e10949f478098374ac5d4c635e046e10abd37c2a Mon Sep 17 00:00:00 2001
From: Sanket Padawe <sanketpadawe@google.com>
Date: Thu, 8 Jun 2017 11:02:45 -0700
Subject: Fix bad merge conflict resolution in oc-dev by ag/2040324

Earlier, it was added by  ag/1730167

Fix: 62361287
Test: manual
Change-Id: I5d15f0778f9d41a87121a39492f19299fde3eac9
---
 assets/carrier_config_311480.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index fb7696a..e5a92f9 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -131,6 +131,14 @@
         <boolean name="is_ims_conference_size_enforced_bool" value="true"/>
         <int name="ims_conference_size_limit_int" value="5" />
         <boolean name="support_3gpp_call_forwarding_while_roaming_bool" value="false" />
+        <string-array name="call_forwarding_blocks_while_roaming_string_array" num="2">
+            <item value="*71" />
+            <item value="*72" />
+        </string-array>
         <boolean name="disable_voice_barring_notification_bool" value="true" />
     </carrier_config>
+    <!-- Tracfone Vzw shows empty string as SPN -->
+    <carrier_config gid1="BA01270000000000">
+        <boolean name="carrier_name_override_bool" value="true" />
+    </carrier_config>
 </carrier_config_list>
-- 
cgit v1.2.3