tree 84f51254c9ffc642dd5ae5e5fdc89d2697fc780f
parent 44718c4b8b3c7655ecc34981c8ee41e1daf34f00
parent 410abcdb41f5bca84574e7b07d3f022d5e05e4c9
author Hung-ying Tyan <tyanh@google.com> 1438311439 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438311439 +0000

am 410abcdb: Merge "Revise lockdown check in getLegacyVpnInfo()" into mnc-dev

* commit '410abcdb41f5bca84574e7b07d3f022d5e05e4c9':
  Revise lockdown check in getLegacyVpnInfo()