tree d250eef0980568ea3f846165bdea0b517356ebce
parent a383b02c431de7b68f8f913ecfeca9f0051122fe
parent d3b6832edb5530b23132e054135c7fe93f5f9384
author Robin Lee <rgl@google.com> 1436556369 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1436556369 +0000

am d3b6832e: am 7ba46433: Merge "Match getLegacyVpn calls to changed interface" into mnc-dev

* commit 'd3b6832edb5530b23132e054135c7fe93f5f9384':
  Match getLegacyVpn calls to changed interface