tree bb5ca0d715cee319bc3a90873bd4690eacdf67eb
parent 14c115dcce3f7f1e88c511c3dbbc1534e649f761
parent 294afb30e2f0ec8af6a4e72d20e731a13c680299
author Erik Kline <ek@google.com> 1420683299 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1420683299 +0000

am 294afb30: Merge "Consider VPN always to be a supported type." into lmp-mr1-dev

* commit '294afb30e2f0ec8af6a4e72d20e731a13c680299':
  Consider VPN always to be a supported type.