commit | 12ee3ae4b1b803cdf9f9293fb8d5bd35956aeb88 | [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 | 4aa9ce54314c8a77d184ab90ac2f7dcc4df6aff7 | |
parent | 196427082d2b35020bf6976ddae40f5dae62183b [diff] | |
parent | 01312d3f4d6c3080fad8d82d5ff7ed12b686582f [diff] |
am 003d7f8d: am e851c562: Merge change Iea75a523 into eclair Merge commit '003d7f8da66ec53b5dbece36308197dc7a932e3e' * commit '003d7f8da66ec53b5dbece36308197dc7a932e3e': Fixes for socket options on multicast sockets.