Robin Lee d5afb5a60c resolve merge conflicts of 6446d2f to master ...

Change-Id: Ibf37d7fed8f8fbb32a601944f504494101c21a3e

2016-12-23 12:16:19 +00:00

..

AppDialog.java

Depend on support lib preferences

2015-10-13 10:12:20 -04:00

AppDialogFragment.java

Update package names to work with the proto3 compiler

2016-11-08 14:06:17 +00:00

AppManagementFragment.java

Implement always-on VPN separate lockdown setting

2016-12-20 15:20:43 +00:00

AppPreference.java

Be more aggressive caching Vpn preference attrs

2016-04-21 18:04:42 +01:00

AppVpnInfo.java

Show app VPNs in always-on list

2016-01-14 17:17:52 +00:00

ConfigDialog.java

Don't show always-on option connecting PPTP vpn

2016-06-30 09:05:58 +00:00

ConfigDialogFragment.java

Implement always-on VPN separate lockdown setting

2016-12-20 15:20:43 +00:00

ConfirmLockdownFragment.java

Implement always-on VPN separate lockdown setting

2016-12-20 15:20:43 +00:00

LegacyVpnPreference.java

Be more aggressive caching Vpn preference attrs

2016-04-21 18:04:42 +01:00

ManageablePreference.java

Be more aggressive caching Vpn preference attrs

2016-04-21 18:04:42 +01:00

VpnSettings.java

resolve merge conflicts of 6446d2f to master

2016-12-23 12:16:19 +00:00

VpnUtils.java

Implement always-on VPN separate lockdown setting

2016-12-20 15:20:43 +00:00