| commit | 780cf25bf433739d8e4ba6db9ab21afb367da1ff | [log] [tgz] |
|---|---|---|
| author | Nick Kralevich <nnk@google.com> | Tue Apr 30 08:46:47 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 30 08:46:47 2013 -0700 |
| tree | ba8756a45fdf1e97220f0c9e1a5050768c9df0bd | |
| parent | cfb0b8bd5e0e616eb8807184524fd1a7361af73d [diff] | |
| parent | 89357dc730f6bfd532c4aed80373c84904cc3319 [diff] |
am 89357dc7: am c6dc62f0: Merge "[NETFILTER]: Fix iptables ABI breakage" * commit '89357dc730f6bfd532c4aed80373c84904cc3319': [NETFILTER]: Fix iptables ABI breakage