Hugo Benichi 46a7508229 Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" ...

am: cb3c24e36b

Change-Id: Ifbdd005576b3f0fbf278ecec81ce3e4308c6276d

2017-08-18 11:59:02 +00:00

..

core/java/com/android/server

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities"

2017-08-18 11:59:02 +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