From: Lorenzo Colitti <lorenzo@google.com>
Date: Thu, 1 Oct 2009 04:16:39 +0000 (-0700)
Subject: am 0c0cfd5c: Merge change I96cd6f5b into eclair
X-Git-Tag: android-x86-2.2~120^2~16
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ae8d0254dd69392dae9c922462ca2a01944b6eef;p=android-x86%2Fdalvik.git

am 0c0cfd5c: Merge change I96cd6f5b into eclair

Merge commit '0c0cfd5ce4a26187fb910ba701d0021989103a25' into eclair-plus-aosp

* commit '0c0cfd5ce4a26187fb910ba701d0021989103a25':
  Make the socket test accept ::1 as a valid result for
---

ae8d0254dd69392dae9c922462ca2a01944b6eef