OSDN Git Service

am 1cf3dbce: Merge change 25160 into eclair
authorLorenzo Colitti <lorenzo@google.com>
Wed, 16 Sep 2009 01:24:49 +0000 (18:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 16 Sep 2009 01:24:49 +0000 (18:24 -0700)
commita28e7d1a32d3883b5b279f5ddc8473e6bcbf6760
treeaa99025f2ee9cef71f7ac8b5cd79e3a05ae2c954
parentd9f8adbfa912c24fb29d2a7e2ce7421a3f96ef82
parent1cf3dbce0b94ae5427ef19422224627e20808364
am 1cf3dbce: Merge change 25160 into eclair

Merge commit '1cf3dbce0b94ae5427ef19422224627e20808364' into eclair-plus-aosp

* commit '1cf3dbce0b94ae5427ef19422224627e20808364':
  Make getHostByAddr and getHostByName return the proper object type.