Jeff Davidson c79924f741 am b431a198: am e6bc5adf: am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev ...

* commit 'b431a198ec255be7efb30b4c81a779a4eb5009f6':
  Enforce VPN control "permission" with an actual permission.

2014-11-18 02:30:54 +00:00

..

res

Import translations. DO NOT MERGE

2014-11-17 13:02:56 -08:00

src/com/android/vpndialogs

Restore legacy VPN stats dialog.

2014-08-22 17:06:37 -07:00

Android.mk

…

AndroidManifest.xml

Enforce VPN control "permission" with an actual permission.

2014-11-12 08:56:20 -08:00