Automerger Merge Worker c7bd3a2336 Merge "Address cleanup comments from aosp/1234607" am: 9dec7506d3 am: 008480e019 ...

Change-Id: I4c52881346cada4fa65d8d9d39f9b461177a3c8e

2020-03-13 23:42:29 +00:00

..

AppDialog.java

Sort imports

2018-08-28 22:13:15 +00:00

AppDialogFragment.java

Update setVpnPackageAuthorization call with VPN type

2020-02-04 21:06:07 +00:00

AppManagementFragment.java

Disable Settings toggle if admin has set always-on VPN

2020-02-18 17:56:54 +00:00

AppPreference.java

Sort imports

2018-08-28 22:13:15 +00:00

AppVpnInfo.java

…

ConfigDialog.java

Address cleanup comments from aosp/1234607

2020-03-11 05:46:27 +00:00

ConfigDialogFragment.java

Merge "Fix code for NPE when click add and cancel repeatly VPN profile" am: 70cae1ce8d

2019-04-09 11:44:05 -07:00

ConfirmLockdownFragment.java

Migrate all MetricsProto enums to SettingsEnums

2019-01-17 14:55:42 -08:00

LegacyVpnPreference.java

Sort imports

2018-08-28 22:13:15 +00:00

ManageablePreference.java

Reorder and clean up imports.

2018-06-18 15:45:09 -07:00

OWNERS

Change the owners of vpn2 settings again

2019-04-11 17:28:28 +02:00

VpnSettings.java

Add Platform VPNs to VPN list

2020-01-30 01:46:19 -08:00

VpnUtils.java

Clean up KeyStore exception warning caused by adding a new VPN.

2018-06-12 17:22:12 +01:00