tree 6de27c86ab3faa2aaed61c40edc5cb2d86b84d8b
parent aa5a99b3b8655f0d092f76fe97a33b477da5262b
parent eb3c0d9ac387bb0aea5b4956daac1403253bc76d
author Chad Brubaker <cbrubaker@google.com> 1395443364 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395443364 +0000

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

* commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d':
  Fix support for simultaneous VPN tuns