Erik Kline 9d02ee9030 Merge "More concisely export whether we have a "tetherable configuration"" ...

am: edea114308

Change-Id: I5f9717c9dab6b39f1fbf2186107b2a1f3f2d4f8f

2017-01-23 07:13:56 +00:00

..

core/java/com/android/server

Merge "More concisely export whether we have a "tetherable configuration""

2017-01-23 07:13:56 +00: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