Robin Lee adab05fdfc Merge changes I31d5260d,Ied92f558 into nyc-dev ...

am: 9677633814

* commit '9677633814868394f11097c549cea65155f80c29':
  Start VPN as early as possible during startup
  Split network agent created state from connected state

Change-Id: I55167ad8f3cde11407a2d35b0f859c263c0fbbec

2016-05-04 18:55:11 +00:00

..

core/java/com/android/server

Merge changes I31d5260d,Ied92f558 into nyc-dev

2016-05-04 18:55:11 +00:00

net/java/android/net/apf

Add a toString method to ApfCapabilities.

2016-03-28 17:33:30 +09:00

tests/servicestests

Cap number of NetworkRequests a UID can make to 100

2016-04-20 10:52:47 -04:00