OSDN Git Service

Merge "Fix that fail to setup any vpn after Network Settings reset and always-on...
authorRobin Lee <rgl@google.com>
Mon, 6 Jun 2016 10:43:54 +0000 (10:43 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 6 Jun 2016 10:43:54 +0000 (10:43 +0000)
commit51261c6451646067e1fde28e2e62efb65c399b5f
tree1df991cb98391efcba93326fa00ed7a487dbeadb
parente473da278f70bda98a08a96f656f639c3e3fd2a0
parentd2cf835880f2207e2df090599130f32ccb73f23d
Merge "Fix that fail to setup any vpn after Network Settings reset and always-on vpn is on" into nyc-dev am: 265f4113ee
am: d2cf835880

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

Change-Id: I676da29aa5322563b20a95afd504e3b4d68fd2a0