OSDN Git Service

am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait for xtables...
authorYusuke Sato <yusukes@google.com>
Thu, 27 Aug 2015 11:28:07 +0000 (11:28 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 11:28:07 +0000 (11:28 +0000)
* commit '56cc45f112c1bb21784e1763a4bf748351063f5a':


Trivial merge