tree daeb3dede791eb76ce61f80dd1de589ca1379398
parent aa4320a4fb27684bd70cfb4d82feca3845ad272e
parent e851c562ee5eb514135b5066553fcef6b0e5c333
author Lorenzo Colitti <lorenzo@google.com> 1254370343 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1254370343 -0700

am e851c562: Merge change Iea75a523 into eclair

Merge commit 'e851c562ee5eb514135b5066553fcef6b0e5c333' into eclair-plus-aosp

* commit 'e851c562ee5eb514135b5066553fcef6b0e5c333':
  Fixes for socket options on multicast sockets.