Jeff Sharkey 16580a6028 resolve merge conflicts of c79a568 to nyc-dev-plus-aosp ...

Change-Id: I3ee02bc596f285fa41ffcafa882ae5997ef67d22

2016-04-25 15:53:50 -06:00

..

core/java/com/android/server

resolve merge conflicts of c79a568 to nyc-dev-plus-aosp

2016-04-25 15:53:50 -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