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)
* commit 'c132be495ffeae7c393175c66943195dee84479e':


Trivial merge