tree 7bcbf409b1e35d45b81b3ffa2c62f2ad3327a9e1
parent 9bd5d8a6f9e22cc6d72c7ecdd281a1aa8deadf75
parent 7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1
author Hung-ying Tyan <tyanh@google.com> 1438312233 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1438312233 +0000

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

* commit '7b2b74e13a1d6b88b0ba8c4d8d7fd5e11a30d2d1':
  Revise lockdown check in getLegacyVpnInfo()