Roland Levillain 8ad104e62c Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE"" ...

am: a4fcd1a2b7

Change-Id: I49221522c1a9a6e7d4ae72529c1a47b736e26a39

2017-07-04 11:31:30 +00:00

..

core/java/com/android/server

Merge "Revert "ConnectivityManager: allow usage of TYPE_NONE""

2017-07-04 11:31:30 +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