Jeff Sharkey d985d3f505 resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp ...

Change-Id: I65f892594034c6de4ac17459c01e146fe4c4e377

2016-04-25 15:52:11 -06:00

..

core/java/com/android/server

resolve merge conflicts of 59ad404 to nyc-mr1-dev-plus-aosp

2016-04-25 15:52:11 -06: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