Hugo Benichi 5983a772cb Merge "ConnectivityManager: no double NetworkCallback registration" ...

am: 06a192fa49

Change-Id: I250fa7d3c5e37a66caa41cc898a44bcb18c9a0c4

2017-03-02 08:04:03 +00:00

..

android/net

ConnectivityManager: no double NetworkCallback registration

2017-03-02 15:19:37 +09:00

com/android/server

Merge "Also test for additional NetworkCallback calls"

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