OSDN Git Service

am 49b53c0b: merge from froyo-plus-aosp
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 14 Jun 2010 18:20:52 +0000 (11:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jun 2010 18:20:52 +0000 (11:20 -0700)
commit9903f1a79affa0e27baea244c6ac3d9fb377ba3e
tree8b90f13933f03c87e49d838b0137a1f8febe0e6d
parent0db9a39e2a7de64e062e00419cb9ae7aef95ab70
parent49b53c0b948595ac34a52daca5fc6ef6af336b94
am 49b53c0b: merge from froyo-plus-aosp

Merge commit '49b53c0b948595ac34a52daca5fc6ef6af336b94'

* commit '49b53c0b948595ac34a52daca5fc6ef6af336b94':
  added missing ether_aton and ether_ntoa