Merge "Clear VPN after Clear credentials if VPN is being established"

am: 4ce19f5c4f

Change-Id: Ib35450b0c389da1bbba311c05d1d0346eb612b9e
This commit is contained in:
Robin Lee
2017-01-19 23:13:04 +00:00
committed by android-build-merger
4 changed files with 39 additions and 3 deletions

View File

@@ -5354,6 +5354,8 @@
<!-- Toast message when there is no network connection to start VPN. [CHAR LIMIT=100] -->
<string name="vpn_no_network">There is no network connection. Please try again later.</string>
<!-- Toast message when VPN has disconnected automatically due to Clear credentials. [CHAR LIMIT=NONE] -->
<string name="vpn_disconnected">Disconnected from VPN</string>
<!-- Toast message when a certificate is missing. [CHAR LIMIT=100] -->
<string name="vpn_missing_cert">A certificate is missing. Please edit the profile.</string>