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

am 0304f3bd: (-s ours) am 745484a5: Merge "Add ip[6]tables-restore and ip[6]tables-save to /system/bin"

* commit '0304f3bd45922a134b001955529bc72dc7525303':