Hugo Benichi 3d722e38f3 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev ...

am: 8a8c295879

Change-Id: I4f6cbc0adb461cef6610460daeba72ca38b8f10c

2017-07-28 23:54:03 +00:00

..

core/java/com/android/server

Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev

2017-07-28 23:54:03 +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