tree 173be2f9536b3f91a08a6b214cb8e47eec3a5bd0
parent 88adaa72a385c3199787ecd3dae826f25d38572d
parent 836eff87a93f5b2857b41763197ab6782581aafc
author Xia Wang <xiaw@google.com> 1396410026 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1396410026 +0000

am 836eff87: Merge "Add legacy VPN test framework and test cases" into klp-dev

* commit '836eff87a93f5b2857b41763197ab6782581aafc':
  Add legacy VPN test framework and test cases