| commit | eb3c0d9ac387bb0aea5b4956daac1403253bc76d | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri Mar 21 20:56:41 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 21 20:56:41 2014 +0000 |
| tree | c3efa23f783bdea8b08fd3a079821a396326cd53 | |
| parent | 1fce89d946760a1bcf3a733f55494f963eab00c2 [diff] | |
| parent | 1aad3ad4ec2137c5aa043f96ccc621a4faffeb56 [diff] |
am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev * commit '1aad3ad4ec2137c5aa043f96ccc621a4faffeb56': Fix support for simultaneous VPN tuns