| commit | 70116f2937f818dedd2cd1ef50c5c04523043146 | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Oct 01 13:47:10 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 01 13:47:10 2009 -0700 |
| tree | 9c4790061c69919ae27e717bac70460534d9e9a5 | |
| parent | 0798c7e82a89feeac39b6a78412e5b11feff06d5 [diff] | |
| parent | ae8d0254dd69392dae9c922462ca2a01944b6eef [diff] |
am ae8d0254: am 0c0cfd5c: Merge change I96cd6f5b into eclair Merge commit 'ae8d0254dd69392dae9c922462ca2a01944b6eef' * commit 'ae8d0254dd69392dae9c922462ca2a01944b6eef': Make the socket test accept ::1 as a valid result for