Hugo Benichi 58eee2da4f Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e36b am: c18658e900 am: 5d18f52554 ...

am: 2b93d54dfc

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: c18658e900 am: 5d18f52554

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: d72f5f7c9a am: cd821b231a

2017-05-18 00:48:14 +00:00