Hugo Benichi eea3a77efc Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities" ...

am: b35719a057

Change-Id: I0ab76de59e87c46a6961229399ff7200bce49838

2017-08-16 11:50:55 +00:00

..

core/java/com/android/server

Merge "Allow NetworkAgent "immutable updates" to NetworkCapabilities"

2017-08-16 11:50:55 +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