OSDN Git Service

am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneo...
authorChad Brubaker <cbrubaker@google.com>
Fri, 21 Mar 2014 21:16:46 +0000 (21:16 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 21:16:46 +0000 (21:16 +0000)
commit51e938041e72f29c4e776a8627ea9d8a70d62728
tree939180b0ef6f20e1ffe51731b1231e15b62315c7
parent7f623d6b9459bc982c49f0a74aa2c9911f8e1dd8
parent05e4dc96fbe47480fcd639ac679683c90ba07484
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