Victor Chang 2360356d70 Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev ...

am: 265f4113ee

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

Change-Id: Iba3df72496f067c5e0291449be3bfbd9ce2031ff

2016-06-06 10:33:00 +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

2016-06-06 10:33:00 +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