tree 939180b0ef6f20e1ffe51731b1231e15b62315c7
parent 7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8
parent 05e4dc96fbe47480fcd639ac679683c90ba07484
author Chad Brubaker <cbrubaker@google.com> 1395436606 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1395436606 +0000

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

* commit '05e4dc96fbe47480fcd639ac679683c90ba07484':
  Fix support for simultaneous VPN tuns