Hugo Benichi 0638f10802 Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 46a7508229 am: 886144c1ff ...

am: 77efec92fe

Change-Id: Icd8e328e3c810a644bfb83798bd42fed8dc70425

2017-08-18 12:36:31 +00:00

..

core/java/com/android/server

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: 46a7508229 am: 886144c1ff

2017-08-18 12:36:31 +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