Hugo Benichi 93e1941b43 Merge "ConnectivityManager: allow usage of TYPE_NONE" ...

am: d54a27d898

Change-Id: I72dbd17db63bd7b8637e82f5cdcfec3bf1482962

2017-07-05 14:33:35 +00:00

..

core/java/com/android/server

Merge "ConnectivityManager: allow usage of TYPE_NONE"

2017-07-05 14:33:35 +00:00

net/java/android/net

Clarify some IpManager/ApfFilter debugging output.

2017-04-26 17:17:04 +09:00

tests/servicestests/src/com/android/server

Merge "Finish moving NetworkStats tests to tests/net" am: e1a0562a3f am: cd821b231a

2017-05-18 00:48:14 +00:00