Jeff Sharkey 00faf37463 resolve merge conflicts of d1153a3 to master ...

Change-Id: Iec9a4a76d0db0fbebdca8a732b4666cfaad70267

2016-04-25 16:40:38 -06:00

..

core/java/com/android/server

resolve merge conflicts of d1153a3 to master

2016-04-25 16:40:38 -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