Victor Chang 0ca903017c 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: I86a8f5c9b2dbd8ea71bdc8fb6268f3d9dc7e329d

2016-06-06 10:30:42 +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:30:42 +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