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

am: 7ab82146c1

Change-Id: I9edaf67a24c6486a6aa82c7fcbda9fced1addcdc
This commit is contained in:
Fan Zhang
2017-05-04 02:30:53 +00:00
committed by android-build-merger

View File

@@ -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>