Felipe Leme 4e40ea69d0 Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev ...

am: 638a6e8140

* commit '638a6e8140a22a0ddb5d5dacb02173795073bd1a':
  Fixed connectivity state in some restricted network scenarios.

Change-Id: I0fd66b16c83680940f294ea8e117443ffd8a50cd

2016-05-06 23:38:59 +00:00

..

core/java/com/android/server

Merge "Fixed connectivity state in some restricted network scenarios." into nyc-dev

2016-05-06 23:38:59 +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