OSDN Git Service

Merge "Disable always-on VPN in factoryReset" am: 63c14e0ab6
authorRobin Lee <rgl@google.com>
Mon, 23 Jan 2017 16:54:59 +0000 (16:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 23 Jan 2017 16:54:59 +0000 (16:54 +0000)
commite2554d51c45fe33fd0e2735e3ec7dfe8a80594af
treeae01b8d2e24c591217091c1007e105aa60fd17f1
parent42bd98f1ce474a9495573115115f2a8dc657ed93
parent1135d509c587f9b584cb230c28f9d4690f8a108a
Merge "Disable always-on VPN in factoryReset" am: 63c14e0ab6
am: 1135d509c5

Change-Id: I66b6721932ae8798cbb406cafa04ed0c92fe47f6
services/core/java/com/android/server/ConnectivityService.java