Merge "Add and update string" into pi-dev am: ef9b8cda82

am: 5487984da5

Change-Id: I2844fcdf4bf053434d4f5a57e367dfe1a3bf7b97
This commit is contained in:
hughchen
2018-05-15 12:32:16 -07:00
committed by android-build-merger

View File

@@ -6903,9 +6903,13 @@
<!-- Title for setting tile leading to Connected devices settings [CHAR LIMIT=40]-->
<string name="connected_devices_dashboard_title">Connected devices</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_summary">Bluetooth, Cast, NFC</string>
<string name="connected_devices_dashboard_summary">Bluetooth, driving mode, NFC</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_no_nfc_summary">Bluetooth, Cast</string>
<string name="connected_devices_dashboard_no_nfc_summary">Bluetooth, driving mode</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_no_driving_mode_summary">Bluetooth, NFC</string>
<!-- Summary for Connected devices settings, explaning a few important settings under it [CHAR LIMIT=NONE]-->
<string name="connected_devices_dashboard_no_driving_mode_no_nfc_summary">Bluetooth</string>
<!-- Title for setting tile leading to Apps & Notification settings [CHAR LIMIT=40]-->
<string name="app_and_notification_dashboard_title">Apps &amp; notifications</string>
<!-- Summary for Apps & Notification settings, explaining a few important settings under it [CHAR LIMIT=NONE]-->