Merge "Make netd calls to iptables wait for xtables lock" into mnc-dev
tree: 27874682fec834a19e3bd7ebdba5e0ca665bd059
  1. client/
  2. include/
  3. server/
  4. Android.mk