| commit | 89357dc730f6bfd532c4aed80373c84904cc3319 | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Mon Apr 29 12:51:35 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Apr 29 12:51:35 2013 -0700 |
| tree | b313001bc4a225113947d0dc8647c8b0bfa3f4e2 | |
| parent | 83966db80b9cccc3417db7566242d30a330cde29 [diff] | |
| parent | c6dc62f09c814b9688aee83e80dcfe80cb0ef604 [diff] |
am c6dc62f0: Merge "[NETFILTER]: Fix iptables ABI breakage" * commit 'c6dc62f09c814b9688aee83e80dcfe80cb0ef604': [NETFILTER]: Fix iptables ABI breakage