commit 69104921a94354759e63f1584dfca2046bdd3459
author Fan Zhang <zhfan@google.com> Thu May 04 02:30:53 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu May 04 02:30:53 2017 +0000
tree 1e86c1b427e77015fc8607a60c79a9fc648b672f
parent 23671e84baa13d88778ae933686e2cdc14a7a824
parent 7ab82146c1acb1d2e81498210f8a071c7a9fff8a

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

Change-Id: I9edaf67a24c6486a6aa82c7fcbda9fced1addcdc

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6e166d7..bb4e2a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -750,7 +750,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>