Erik Kline 0f901af920 Merge "request{LinkProperties,NetworkCapabilities} no longer needed" ...

am: 75dfc5bd91

Change-Id: I79b9323be242ed5d2bf83962f78c613a465a20b8

2017-03-07 13:33:29 +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"

2017-03-07 13:33:29 +00:00