Robin Lee 1054057e75 Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814 ...

am: 31b3676cce

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

Change-Id: I6bb605a83b96a3efab36ab6a7bdb5859e1eafea8

2016-05-04 21:40:46 +00:00

..

core/java/com/android/server

Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814

2016-05-04 21:40:46 +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