tree 9fdd6f331fbe2531fbe801149717cc9379ef33f9
parent 508f165911045f283deaccc86f925daffe2867f2
parent 16752d9f7a92d4404a65296080f581d821e52e11
author Yusuke Sato <yusukes@google.com> 1440652028 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440652028 +0000

am 16752d9f: (-s ours) am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"

* commit '16752d9f7a92d4404a65296080f581d821e52e11':