Robin Lee 495418cd9c Merge "Disable always-on VPN in factoryReset" am: 5765604627 ...

am: 7960c6b8b5

Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6

2017-01-23 16:54:59 +00:00

..

core/java/com/android/server

Merge "Disable always-on VPN in factoryReset" am: 5765604627

2017-01-23 16:54:59 +00:00

net/java/android/net

More correct startup and shutdown procedures.

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

tests/servicestests

Merge "DO NOT MERGE: Revert "Update package names to work with the proto3 compiler"" into nyc-mr1-dev-plus-aosp

2017-01-18 19:59:59 +00:00