commit d1f38f302ea40fcdabddae45db2dfd197eca3ee9
author TreeHugger Robot <treehugger-gerrit@google.com> Wed Sep 14 20:27:53 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 14 20:27:54 2016 +0000
tree a37402de6398d3fd57e0f456986d07a1ab2efb13
parent 1c0601b0468b19d734e189c57a0473a09ac4b7b7
parent d92ce3ef0caaa67dbf2b06b9d00fbd19fecba059

Merge "Changed information string about model" into nyc-mr1-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 633c111..341e4a3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2312,7 +2312,7 @@
     <!-- About phone screen, status item label  [CHAR LIMIT=60] -->
     <string name="security_patch">Android security patch level</string>
     <!-- About phone screen, status item label  [CHAR LIMIT=40] -->
-    <string name="model_number">Model number</string>
+    <string name="model_info">Model</string>
     <!-- About phone screen, fcc equipment id label  [CHAR LIMIT=40] -->
     <string name="fcc_equipment_id">Equipment ID</string>
     <!-- About phone screen,  setting option name  [CHAR LIMIT=40] -->

res/xml/device_info_settings.xml

diff --git a/res/xml/device_info_settings.xml b/res/xml/device_info_settings.xml
index 22d3e97..b8fee49 100644
--- a/res/xml/device_info_settings.xml
+++ b/res/xml/device_info_settings.xml
@@ -73,7 +73,7 @@
         <Preference android:key="device_model"
                 android:enabled="false"
                 android:shouldDisableView="false"
-                android:title="@string/model_number"
+                android:title="@string/model_info"
                 android:summary="@string/device_info_default"/>
 
         <!-- Device firmware version -->