OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8a5705c 424d027)
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)
Merge commit '424d027b6e9b2fff2e79b2d65575c00fcf67d915'

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


Trivial merge
bionic
About OSDN
Find Software
Develop Software
Help