Robin Lee 7960c6b8b5 Merge "Disable always-on VPN in factoryReset" ...

am: 5765604627

Change-Id: I021b288e3db17ddefbea3645fd282e3ee123a6e8

2017-01-23 16:47:58 +00:00

..

core/java/com/android/server

Merge "Disable always-on VPN in factoryReset"

2017-01-23 16:47:58 +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