OSDN Git Service

am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns...
authorChad Brubaker <cbrubaker@google.com>
Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 21 Mar 2014 21:09:44 +0000 (21:09 +0000)
commit05e4dc96fbe47480fcd639ac679683c90ba07484
treeb2972244e2e8ee6fa1b9a4d9098e75652a3031de
parent9506e84b6f1b8a63abd5c7ecd580548386cc9aae
parent850eb678d7356ea60925dc6fa450e213d5cea2d5
am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev

* commit '850eb678d7356ea60925dc6fa450e213d5cea2d5':
  Fix support for simultaneous VPN tuns