Lorenzo Colitti 05a404cea0 Merge changes from topic 'network_specifier' am: 78e38f292d am: 362bef45d1 ...

am: cfd729093f

Change-Id: I7535495681da8f168c46d6d95e13925cffecc99b

2017-04-12 22:58:42 +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 changes from topic 'network_specifier' am: 78e38f292d am: 362bef45d1

2017-04-12 22:58:42 +00:00