tree 48b8b3c403b411459babd303217741df0e73722e
parent 821f8b65f01cdc0b0ef427a7b4a3314ca2b2e575
parent 65470ca2ad50eeabd60af9c16d2a00204078e6ff
author Lorenzo Colitti <lorenzo@google.com> 1253045814 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253045814 -0700

am 60195db6: am 9ccfb95e: Merge change 24723 into eclair

Merge commit '60195db609e4f5125e39348651d7a06ff807cc96'

* commit '60195db609e4f5125e39348651d7a06ff807cc96':
  Remove code duplication in InetAddress.getByAddress.