Victor Chang f5464121c0 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev ...

am: 98801e9f2b

* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I84db62a24c34bf8dea6f99d34e108cbb0fc0517f

2016-05-31 09:51:58 +00:00

..

res

Import translations. DO NOT MERGE

2016-05-21 19:12:53 -07:00

src/com/android/vpndialogs

Finish ConfirmDialog when another vpn app is always-on

2016-05-31 09:11:19 +01:00

Android.mk

…

AndroidManifest.xml

Finish ConfirmDialog when another vpn app is always-on

2016-05-31 09:11:19 +01:00