Erik Kline b55e2f55cf Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 6a589b03e6 am: 14025c741e ...

am: bb54baba04

Change-Id: Id2aa8aeff6d299edb85955c12ab0a04023458597

2017-03-07 13:42:11 +00:00

..

android/net

Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499.

2017-03-06 06:16:51 +00:00

com/android/server

Merge "request{LinkProperties,NetworkCapabilities} no longer needed" am: 6a589b03e6 am: 14025c741e

2017-03-07 13:42:11 +00:00