tree a440188b963ccf68ee4be2fa302e7a90d065dd5f
parent 93a67779dc0d85d71dfe333244084341be0aa458
parent 08c704a0fe64927fa8618c576c20e39de7f1aa19
author Colin Cross <ccross@android.com> 1403139427 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1403139427 +0000

am 08c704a0: am 1a9e9c20: am 974a4f3e: Merge "Use inet_ntoa to display ipaddr and mask values"

* commit '08c704a0fe64927fa8618c576c20e39de7f1aa19':
  Use inet_ntoa to display ipaddr and mask values