| commit | 850eb678d7356ea60925dc6fa450e213d5cea2d5 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Fri Mar 21 21:02:47 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Mar 21 21:02:47 2014 +0000 |
| tree | 04829a8bf277c3035e15bd0e723db557507823d4 | |
| parent | c77261471432e1577586395dd0a6a481ef7431b5 [diff] | |
| parent | eb3c0d9ac387bb0aea5b4956daac1403253bc76d [diff] |
am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev * commit 'eb3c0d9ac387bb0aea5b4956daac1403253bc76d': Fix support for simultaneous VPN tuns