Robin Lee 624febb525 Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev ...

am: 4fb4490dfb

* commit '4fb4490dfbf6366813ba7f78acba705f00e21a81':
  Return legacy VPN info regardless of lockdown mode

Change-Id: I89c0784d5edae3c7ef9f8ec1c6ee4f823dbbae02

2016-05-25 21:20:43 +00:00

..

core/java/com/android/server

Merge "Return legacy VPN info regardless of lockdown mode" into nyc-dev

2016-05-25 21:20:43 +00:00

net/java/android/net/apf

ApfFilter unit test

2016-05-10 11:54:42 -04:00

tests/servicestests

Lock down networking when waiting for always-on

2016-05-19 00:26:53 +01:00