| commit | c7af9dfa54d136d6ff2e2050095c309c72875caf | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Thu Oct 01 13:46:58 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 01 13:46:58 2009 -0700 |
| tree | 51a780bab11932248cb259ce640f24494ccfdd31 | |
| parent | dfef39800fc33094bdf4931eee4783e4c302b8ff [diff] | |
| parent | 003d7f8da66ec53b5dbece36308197dc7a932e3e [diff] |
am 003d7f8d: am e851c562: Merge change Iea75a523 into eclair Merge commit '003d7f8da66ec53b5dbece36308197dc7a932e3e' * commit '003d7f8da66ec53b5dbece36308197dc7a932e3e': Fixes for socket options on multicast sockets.