commit 123808102f9036a71198a96ea6cf33cfa3b5ad69
author Tyler Gunn <tgunn@google.com> Wed Jun 22 16:36:30 2016 -0700
committer The Android Automerger <android-build@google.com> Mon Jun 27 14:54:03 2016 -0700
tree f81cfd0f531963a6fa17f04d48d2ca814cd573de
parent 550ea646af963f7c343baf317302a8e74c8a31f1

Disallow merge of wifi calls when vowifi off for VZW.

Bug: 29059073
Change-Id: I167f21f2d08c814da5cc04a5cf956dd4c826c849

assets/carrier_config_311480.xml

diff --git a/assets/carrier_config_311480.xml b/assets/carrier_config_311480.xml
index 45b755f..db242ea 100644
--- a/assets/carrier_config_311480.xml
+++ b/assets/carrier_config_311480.xml
@@ -36,5 +36,6 @@
         <boolean name="treat_downgraded_video_calls_as_video_calls_bool" value="true" />
         <boolean name="drop_video_call_when_answering_audio_call_bool" value="true" />
         <boolean name="editable_wfc_mode_bool" value="false"/>
+        <boolean name="allow_merge_wifi_calls_when_vowifi_off_bool" value="false" />
     </carrier_config>
 </carrier_config_list>