OSDN Git Service

am 59da4baf: (-s ours) am b725a59f: Merge "DO NOT MERGE: NatController: remove flushi...
authorJP Abgrall <jpa@google.com>
Wed, 27 Jul 2011 01:37:02 +0000 (18:37 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 27 Jul 2011 01:37:02 +0000 (18:37 -0700)
commitafc5f95c6f18b2efd41b0d8c85377eb70fa396e9
treeead949ac82f199f6fb884fe6736903672e7afb1a
parent1bb28f46f995a3768c2bb6aafb2fb2bdfb820d6c
parent59da4baf881d7f5e2ae82bead547766cbf2c9710
am 59da4baf: (-s ours) am b725a59f: Merge "DO NOT MERGE: NatController: remove flushing the INPUT/OUTPUT tables." into honeycomb-LTE

* commit '59da4baf881d7f5e2ae82bead547766cbf2c9710':
  DO NOT MERGE: NatController: remove flushing the INPUT/OUTPUT tables.