Hugo Benichi 369984c2e3 Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd ...

am: 0c1f013ba2

* commit '0c1f013ba243eff80772317c2b6c5beb2083fe2b':
  Split network monitoring and portal probe events

Change-Id: I4cd3eeb25f63fe3731883ec2cc4fbfc3602bfba8

2016-04-22 09:55:38 +00:00

..

core/java/com/android/server

Merge "Split network monitoring and portal probe events" into nyc-dev am: 784c93e372 am: cbb0d77bcd

2016-04-22 09:55:38 +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