OSDN Git Service

am e851c562: Merge change Iea75a523 into eclair
authorLorenzo Colitti <lorenzo@google.com>
Thu, 1 Oct 2009 04:12:23 +0000 (21:12 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Oct 2009 04:12:23 +0000 (21:12 -0700)
Merge commit 'e851c562ee5eb514135b5066553fcef6b0e5c333' into eclair-plus-aosp

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


Trivial merge