Hugo Benichi a89d8bbc8d Merge "Split network monitoring and portal probe events" into nyc-dev ...

am: 784c93e372

* commit '784c93e372ff8ba8ca59499a8e35d83e5bd71c1a':
  Split network monitoring and portal probe events

Change-Id: I1e9208a9c8cd178ec31edf1755cc82db980b9071

2016-04-22 09:51:01 +00:00

..

core/java/com/android/server

Merge "Split network monitoring and portal probe events" into nyc-dev

2016-04-22 09:51:01 +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