tree 09a2890601969ad16f86bb6491e25fefb3a584a1
parent 32902267f653780927250e847b518afb10f3bb6c
parent c4afcd7f3bfbc3b0c74eb024d2263cc6cc40b9d3
author Yusuke Sato <yusukes@google.com> 1440684819 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440684819 +0000

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

* commit 'c4afcd7f3bfbc3b0c74eb024d2263cc6cc40b9d3':