tree 0d17e70868d2e1912bc6bc5a405767445b69ef15
parent b3765b2ee701492afd83cef5a60b47cce0f1c4a4
parent 3871d57ba581236142c9bf2f8be2d34cce7c5829
author Jean-Baptiste Queru <jbq@google.com> 1282163509 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282163509 -0700

am 3871d57b: Revert "added missing ether_aton and ether_ntoa"

Merge commit '3871d57ba581236142c9bf2f8be2d34cce7c5829'

* commit '3871d57ba581236142c9bf2f8be2d34cce7c5829':
  Revert "added missing ether_aton and ether_ntoa"