commit | 01312d3f4d6c3080fad8d82d5ff7ed12b686582f | [log] [tgz] |
---|---|---|
author | Lorenzo Colitti <lorenzo@google.com> | Wed Sep 30 21:12:23 2009 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 30 21:12:23 2009 -0700 |
tree | d62bf8ecc0f44f06d109d9594eb5bbd8f1341046 | |
parent | 289c6ef627bca42145f7b57c774523a8ac44791e [diff] | |
parent | 0074d5b9f8f1dfa68766ac62f0a67cdc87bdd1da [diff] |
am e851c562: Merge change Iea75a523 into eclair Merge commit 'e851c562ee5eb514135b5066553fcef6b0e5c333' into eclair-plus-aosp * commit 'e851c562ee5eb514135b5066553fcef6b0e5c333': Fixes for socket options on multicast sockets.