Merge "Add global HTTP proxy to Privacy Settings page"

This commit is contained in:
Bartosz Fabianowski
2017-01-13 20:51:46 +00:00
committed by Android (Google) Code Review
11 changed files with 182 additions and 1 deletions

View File

@@ -8013,6 +8013,8 @@
<string name="enterprise_privacy_always_on_vpn_personal">Always-on VPN turned on in your personal profile</string>
<!-- Label explaining that an always-on VPN was set by the admin in the work profile. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_always_on_vpn_work">Always-on VPN turned on in your work profile</string>
<!-- Label explaining that a global HTTP proxy was set by the admin. [CHAR LIMIT=NONE] -->
<string name="enterprise_privacy_global_http_proxy">Global HTTP proxy set</string>
<!-- Preference label for the Photos & Videos storage section. [CHAR LIMIT=50] -->
<string name="storage_photos_videos">Photos &amp; Videos</string>