commit d57e13f55827e6bb7a17ca0da89927a604dbaf15
author Xin Li <delphij@google.com> Tue Sep 01 20:04:34 2020 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 01 20:04:34 2020 +0000
tree a8f479229bed8b05bdc34e76915cb90ef90cd117
parent 318f6bcc539402a5b77b953aae85a192a0bdd655
parent 748efff8561cf9cb0c1131c0dbf2ed231e978dc8

Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master

res/values/arrays.xml

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 1ad3cc3..34ba122 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1352,7 +1352,7 @@
         <item>CDMA/EvDo/GSM/WCDMA</item>
         <item>CDMA + LTE/EvDo</item>
         <item>GSM/WCDMA/LTE</item>
-        <item>Global</item>
+        <item>LTE/CDMA/EvDo/GSM/WCDMA</item>
         <item>LTE</item>
         <item>LTE / WCDMA</item>
         <item>TDSCDMA only</item>
@@ -1369,7 +1369,8 @@
         <item>NR/LTE</item>
         <item>NR/LTE/CDMA/EvDo</item>
         <item>NR/LTE/GSM/WCDMA</item>
-        <item>NR/LTE/CDMA/EvDo/GSM/WCDMA</item>
+        <!-- Global includes NR/LTE/CDMA/EvDo/GSM/WCDMA -->
+        <item>Global</item>
         <item>NR/LTE/WCDMA</item>
         <item>NR/LTE/TDSCDMA</item>
         <item>NR/LTE/TDSCDMA/GSM</item>