commit 7ab82146c1acb1d2e81498210f8a071c7a9fff8a
author Fan Zhang <zhfan@google.com> Thu May 04 02:28:22 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 02:28:22 2017 +0000
tree c1f4204d278516779f30f33d444882937191de27
parent fdd0f1e1411524e33ef7e35660334b5defab2ac6
parent efed517a8a039422ee6bf738384ed0d62ee19973

Merge "Fix string where it says "phone" on a tablet." into oc-dev
am: efed517a8a

Change-Id: Ie45ef80d5b9a5307517497bf441dced20dd9062f

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e7d17cb..41925a5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -747,7 +747,9 @@
     <!-- Security Settings screen setting option title for the item to take you to the encryption and credential screen -->
     <string name="encryption_and_credential_settings_title">Encryption &amp; credentials</string>
     <!-- Security Settings screen Encryption and crendential summary -->
-    <string name="encryption_and_credential_settings_summary">Phone encrypted</string>
+    <string name="encryption_and_credential_settings_summary" product="default">Phone encrypted</string>
+    <!-- Security Settings screen Encryption and crendential summary -->
+    <string name="encryption_and_credential_settings_summary" product="tablet">Device encrypted</string>
     <!-- Security Settings screen setting option title for the item to take you to the lock screen preference screen [CHAR LIMIT=60] -->
     <string name="lockscreen_settings_title">Lock screen preferences</string>