Robin Lee c9327b4903 Merge "Disable always-on VPN in factoryReset" am: 9847e78b72 am: adb7a1c631 am: f6c57b8f2f ...

am: 5c709185ef

Change-Id: Iaccb7394994ccce66df0ab2f713fd890a8b999c8

2017-01-23 17:05:42 +00:00

..

core/java/com/android/server

Merge "Disable always-on VPN in factoryReset" am: 9847e78b72 am: adb7a1c631 am: f6c57b8f2f

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