tree 4845f0535c11efacf6ec1ee7cbfc01c137e8b373
parent ced0e2960d1608df92d7de28fffc6c51001843d2
parent 265f4113ee42e89f324b087a81044a9f1dab457e
author Victor Chang <vichang@google.com> 1465209180 +0000
committer android-build-merger <android-build-merger@google.com> 1465209180 +0000

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: Iba3df72496f067c5e0291449be3bfbd9ce2031ff