Victor Chang b450b1fc88 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 3e9051602c ...

am: a8ca6d9662

* commit 'a8ca6d96624002023d7d83d731b2dda8023e7360':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

Change-Id: I4641b2813820c82cc8509e0ba27f679733d45d6b

2016-06-06 10:51:29 +00:00

..

core/java/com/android/server

Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee am: 3e9051602c

2016-06-06 10:51:29 +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