Hugo Benichi dc2b32d9a0 Merge "Logging improvements when NetworkCapabilities change" ...

am: 935759cfff

Change-Id: I886e39db8969eb1ac1dfe06c6f448e53a90fd92c

2017-07-31 01:50:38 +00:00

..

core/java/com/android/server

Merge "Logging improvements when NetworkCapabilities change"

2017-07-31 01:50:38 +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