OSDN Git Service

am 916188db: am 56cc45f1: (-s ours) am f2fed764: Make iptables -L and -S calls wait...
authorYusuke Sato <yusukes@google.com>
Thu, 27 Aug 2015 20:21:54 +0000 (20:21 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 27 Aug 2015 20:21:54 +0000 (20:21 +0000)
* commit '916188db012f458aeab7c6857db2dc1618a98a26':


Trivial merge