OSDN Git Service

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

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