Hugo Benichi 6ab129c8e4 Merge "Some fixes in ConnectivityService event logging" into nyc-dev ...

am: 7261fb27de

* commit '7261fb27de16bb6d3ebd81bd3b73062bd212ea7e':
  Some fixes in ConnectivityService event logging

Change-Id: I0ca861a1d35eb6cdb5490d04a725d64465eebc31

2016-04-21 04:12:56 +00:00

..

core/java/com/android/server

Merge "Some fixes in ConnectivityService event logging" into nyc-dev

2016-04-21 04:12:56 +00:00

net/java/android/net/apf

Add a toString method to ApfCapabilities.

2016-03-28 17:33:30 +09:00

tests/servicestests

If Internet probe is redirected, pass redirect destination to NetworkAgent.

2016-04-12 08:54:36 -04:00