Hugo Benichi 170cc51f45 Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev ...

am: 5c55f974bf

Change-Id: I165a8bbe8362100f1e2bb909459fb45b1c68d5ae

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

..

core/java/com/android/server

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

2017-07-28 23:54:05 +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: d72f5f7c9a am: cd821b231a

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