tree 47d6e7f37a537029178ebefd73605ed0cb576248
parent ae31834819acc0b29007a41d27308a42a9f46e4a
parent e91f0a967b15af2a4a1e4ec2af8464dfca3560de
author JP Abgrall <jpa@google.com> 1337629235 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1337629235 -0700

am e91f0a96: am 81f6da52: Merge "dumpstate: collect xtables based iface stats, update iptables info." into jb-dev

* commit 'e91f0a967b15af2a4a1e4ec2af8464dfca3560de':
  dumpstate: collect xtables based iface stats, update iptables info.