Hugo Benichi 13df02f93c Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 5c55f974bf ...

am: 170cc51f45

Change-Id: I633d6347a7f852c27c03fc96b36ca2a60f70c73c

2017-07-29 00:03:33 +00:00

..

core/java/com/android/server

Merge "Logging improvements when NetworkCapabilities change" into oc-dr1-dev am: 5c55f974bf

2017-07-29 00:03:33 +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