Hugo Benichi ca809f4260 Merge "Revert "ConnectivityManager: no double NetworkCallback registration" because oit caused regressions http://b/35955593, http://b/35921499." am: 704520c392 am: e8a3a43193 ...

am: 22d4258a75

Change-Id: I8e66e223003a38735b707d21d7bedb19170b1937

2017-03-06 12:45:10 +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" am: dff6c5c30d am: 6978b2427c

2017-03-01 11:13:14 +00:00