OSDN Git Service

am 424d027b: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Jul 2010 18:43:48 +0000 (11:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 2 Jul 2010 18:43:48 +0000 (11:43 -0700)
commitcd122865a53d1b5f9ae7ce46520911a0c02be643
tree32d11d799294a0b1170d888faf4d9d50cb77f0e9
parent8a5705c7fa76e8a23c2dcdcd7a4d20aae44f1b3c
parent424d027b6e9b2fff2e79b2d65575c00fcf67d915
am 424d027b: merge from open-source master

Merge commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915'

* commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915':
  Regenerate linux/netfilter_ipv6/ip6_tables.h.