| commit | cd122865a53d1b5f9ae7ce46520911a0c02be643 | [log] [tgz] |
|---|---|---|
| author | The Android Open Source Project <initial-contribution@android.com> | Fri Jul 02 11:43:48 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 02 11:43:48 2010 -0700 |
| tree | 32d11d799294a0b1170d888faf4d9d50cb77f0e9 | |
| parent | 8a5705c7fa76e8a23c2dcdcd7a4d20aae44f1b3c [diff] | |
| parent | 424d027b6e9b2fff2e79b2d65575c00fcf67d915 [diff] |
am 424d027b: merge from open-source master Merge commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915' * commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915': Regenerate linux/netfilter_ipv6/ip6_tables.h.