commit cc4f2c07151166816e8d57731857b67f700fb6b3
author Wink Saville <wink@google.com> Wed Jan 16 21:12:56 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 16 21:12:56 2013 -0800
tree bea1603721c3b1cd77eef20af55c4d91843a333d
parent 1c1ab618a118caee71101f46dd1d5aa8a56f205d
parent 509b510ee16b6b478cd8acf97087245e496872de

am 509b510e: Merge commit \'9b22c4f9\' into fix-merge-conflict

* commit '509b510ee16b6b478cd8acf97087245e496872de':
  Toro: Add overlay to use network mode 7 for cdma/lte

overlay/packages/apps/Phone/res/values/strings.xml

diff --git a/overlay/packages/apps/Phone/res/values/strings.xml b/overlay/packages/apps/Phone/res/values/strings.xml
index 715f325..492edae 100644
--- a/overlay/packages/apps/Phone/res/values/strings.xml
+++ b/overlay/packages/apps/Phone/res/values/strings.xml
@@ -18,5 +18,16 @@
 
     <string name="cell_broadcast_sms">Emergency Alerts SMS</string>
 
+    <!-- Bug in RIL. It believes 7 is CDMA/LTE/EVDO even though that contradicts ril.h -->
+    <string name="preferred_network_mode_cdma_evdo_gsm_wcdma_summary">Preferred network mode: LTE / CDMA</string>
+
+    <string-array name="preferred_network_mode_choices">
+        <item>LTE/CDMA</item>
+        <item>CDMA</item>
+    </string-array>
+    <string-array name="preferred_network_mode_values" translatable="false">
+        <item>"7"</item>
+        <item>"4"</item>
+    </string-array>
 </resources>