Hugo Benichi ac7e9a2b47 Merge "ConnectivityServiceTest: some fixes in CallbackInfo" ...

am: 37727596cc

Change-Id: I636b7b0ef210aaa3e130e1c1a162a35cdc099295

2017-01-16 05:00:30 +00:00

..

core/java/com/android/server

DO NOT MERGE Captive portal systel log improvements

2017-01-05 12:09:35 +09:00

net/java/android/net

More correct startup and shutdown procedures.

2016-12-15 10:43:41 +09:00

tests/servicestests

Merge "ConnectivityServiceTest: some fixes in CallbackInfo"

2017-01-16 05:00:30 +00:00