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

2016-05-25 21:05:55 +00:00

..

core/java/com/android/server

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

2016-05-25 21:05:55 +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