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

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

2014-11-17 22:58:05 +00:00

..

assets

…

res

am e0cb56b0: Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev

2014-11-17 22:58:05 +00:00

Android.mk

…

AndroidManifest.xml

Merge "Enforce VPN control "permission" with an actual permission." into lmp-mr1-dev

2014-11-17 21:02:10 +00:00

lint.xml

…

MakeJavaSymbols.sed

…

MODULE_LICENSE_APACHE2

…

NOTICE

…