Jeff Davidson 704b7521b1 am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent. ...

* commit '0e7848748256f4b5709a4c94882e20d96a86ae8e':
  Expose a SystemApi method to prepare a VPN without consent.

2014-11-18 02:05:29 +00:00

..

java/com/android/server

am 0e784874: am 9a1da68b: Expose a SystemApi method to prepare a VPN without consent.

2014-11-18 02:05:29 +00:00

jni

resolved conflicts for merge of 5e6cf242 to lmp-mr1-dev-plus-aosp

2014-11-12 13:24:42 -08:00

Android.mk

…