OSDN Git Service

am c132be49: (-s ours) am 93e6f6a7: Merge "Make iptables -L and -S calls wait for...
authorYusuke Sato <yusukes@google.com>
Thu, 27 Aug 2015 11:28:06 +0000 (11:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:28:06 +0000 (11:28 +0000)
commitd9c0c36ad3141d23a8621ce0325bf727c035b5cf
tree8cade762d952bcb3cabd217449d30ede5787218f
parent4e9e23c50a080719f55e54db783f0c2cb130c95b
parentc132be495ffeae7c393175c66943195dee84479e
am c132be49: (-s ours) am 93e6f6a7: Merge "Make iptables -L and -S calls wait for xtables lock"

* commit 'c132be495ffeae7c393175c66943195dee84479e':