Merge "Add more policy transparency for wifi settings." into nyc-dev

This commit is contained in:
Sudheer Shanka
2016-03-23 17:53:19 +00:00
committed by Android (Google) Code Review
4 changed files with 14 additions and 41 deletions

View File

@@ -1481,9 +1481,6 @@
<!-- Link speed on Wifi Status screen -->
<string name="link_speed">%1$d Mbps</string>
<!-- Wifi Alert message when tapping on a preference for a config locked down by device owner. [CHAR LIMIT=200] -->
<string name="wifi_alert_lockdown_by_device_owner"><xliff:g id="app_name">%1$s</xliff:g> manages your device and doesn\u2019t allow modifying or deleting this Wi-Fi network. For more information, contact your administrator.</string>
<!-- NFC settings -->
<!-- Used in the 1st-level settings screen to turn on NFC -->
<string name="nfc_quick_toggle_title">NFC</string>