tree 9fdd6f331fbe2531fbe801149717cc9379ef33f9
parent 0304f3bd45922a134b001955529bc72dc7525303
parent f2a192e32451d50910c432dbc66352602fda5136
author Yusuke Sato <yusukes@google.com> 1440619154 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1440619154 +0000

am f2a192e3: Merge "Add \'-w\' option to ip[6]tables-restore"

* commit 'f2a192e32451d50910c432dbc66352602fda5136':
  Add '-w' option to ip[6]tables-restore