| commit | 87f738d2787444854cd15695b599b84b25027167 | [log] [tgz] |
|---|---|---|
| author | Chad Brubaker <cbrubaker@google.com> | Mon Mar 24 19:35:25 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Mar 24 19:35:25 2014 +0000 |
| tree | 7ce869402316ac53f3b4f015980811fa01910227 | |
| parent | ff3bb2fe95a7d0158f5a456368eb7fa91069bc23 [diff] | |
| parent | 51e938041e72f29c4e776a8627ea9d8a70d62728 [diff] |
am 51e93804: am 05e4dc96: am 850eb678: am eb3c0d9a: am 1aad3ad4: Merge "Fix support for simultaneous VPN tuns" into klp-dev * commit '51e938041e72f29c4e776a8627ea9d8a70d62728': Fix support for simultaneous VPN tuns