commit | 92ceda97cd153f6bee3db04cd0b6d93f32a12551 | [log] [tgz] |
---|---|---|
author | Chad Brubaker <cbrubaker@google.com> | Sat Mar 22 04:08:56 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Sat Mar 22 04:08:56 2014 +0000 |
tree | 51556e6069676bcb225ddfb91d83d74ad1b4bf45 | |
parent | 803e8d85f3b78f06288d4651cd814f3f05fdcebe [diff] | |
parent | f7635e290be7bf427736f3849981f12369dd5215 [diff] |
am f7635e29: Merge "Move VPN routing decisions from iptables to ip" into klp-dev * commit 'f7635e290be7bf427736f3849981f12369dd5215': Move VPN routing decisions from iptables to ip