tree 95eae833295950855640319ecbc9598411a28a4f
parent 668c297603c6ae20225717741d90d06e819216c0
parent a6269236a24e00947efd3471f2901783413d56e5
author Robin Lee <rgl@google.com> 1464211163 +0000
committer android-build-merger <android-build-merger@google.com> 1464211163 +0000

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