OSDN Git Service

am 51c1ce04: (-s ours) am 4309f87d: DO NOT MERGE: Update OEM iptable hooks and ip fwd
authorWink Saville <wink@google.com>
Fri, 29 Jul 2011 23:56:18 +0000 (16:56 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 29 Jul 2011 23:56:18 +0000 (16:56 -0700)
commit8093c1a0aa2eb1c82df07190a24dc224b9f9fd19
treef89b12d8e6a7072ce875074445a0e9debbd7e5ea
parent6fcb81453c7c759bbbfc5ec2f63205534e7c06e4
parent51c1ce04e8b16f29aa8d9727e65263d8f590c543
am 51c1ce04: (-s ours) am 4309f87d: DO NOT MERGE: Update OEM iptable hooks and ip fwd

* commit '51c1ce04e8b16f29aa8d9727e65263d8f590c543':
  DO NOT MERGE: Update OEM iptable hooks and ip fwd