Robin Lee e823566924 Merge "Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814 am: 31b3676cce" into nyc-mr1-dev-plus-aosp ...

am: fbde3272fd

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

Change-Id: I6e1d6a1977db342f45a1a9114a56c181540e12bf

2016-05-04 22:03:54 +00:00

..

core/java/com/android/server

Merge "Merge changes I31d5260d,Ied92f558 into nyc-dev am: 9677633814 am: 31b3676cce" into nyc-mr1-dev-plus-aosp

2016-05-04 22:03:54 +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