OSDN Git Service

Merge "Fix that fail to setup any vpn after Network Settings reset and always-on...
authorVictor Chang <vichang@google.com>
Mon, 6 Jun 2016 10:30:42 +0000 (10:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 10:30:42 +0000 (10:30 +0000)
commitd2cf835880f2207e2df090599130f32ccb73f23d
tree6e7d1dbd5b6d6e450b49f8fc00889c6d86abbc26
parent13c2764cef15b9fe4b67f98be458f3108a9137f3
parent265f4113ee42e89f324b087a81044a9f1dab457e
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev
am: 265f4113ee

* commit '265f4113ee42e89f324b087a81044a9f1dab457e':
  Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on

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