Hugo Benichi 4cf199383f Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." ...

am: 704520c392

Change-Id: Ia0ae78f8406b81377491407cf5ef8ca339952def

2017-03-06 12:30:05 +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 "Also test for additional NetworkCallback calls"

2017-03-01 11:03:08 +00:00