Robin Lee d1b8497454 Merge "Disable always-on VPN in factoryReset" am: 5765604627 am: 7960c6b8b5 ...

am: 495418cd9c

Change-Id: I99207281321861a3e720b5c1e2e316e12b104677

2017-01-23 17:01:31 +00:00

..

core/java/com/android/server

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

2017-01-23 17:01:31 +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