OSDN Git Service

Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
authorRobin Lee <rgl@google.com>
Wed, 25 May 2016 21:19:23 +0000 (21:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 25 May 2016 21:19:23 +0000 (21:19 +0000)
commit74cc9772e9769b8c6a8cd6a6bb36cc8cfd5efb74
tree95eae833295950855640319ecbc9598411a28a4f
parent668c297603c6ae20225717741d90d06e819216c0
parenta6269236a24e00947efd3471f2901783413d56e5
Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
am: a6269236a2

* commit 'a6269236a24e00947efd3471f2901783413d56e5':
  Don't crash trying to disable lockdown VPN

Change-Id: I71ecde2a45a26c775f5738c232b7d0da834af42a