tree c3efa23f783bdea8b08fd3a079821a396326cd53
parent 1fce89d946760a1bcf3a733f55494f963eab00c2
parent 1aad3ad4ec2137c5aa043f96ccc621a4faffeb56
author Chad Brubaker <cbrubaker@google.com> 1395435401 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395435401 +0000

am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit '1aad3ad4ec2137c5aa043f96ccc621a4faffeb56':
  Fix support for simultaneous VPN tuns