OSDN Git Service

am 5d26339a: DO NOT MERGE: backport the IPv6 NetworkInterface/multicast fixes.
authorElliott Hughes <enh@google.com>
Tue, 1 Dec 2009 19:31:45 +0000 (11:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Dec 2009 19:31:45 +0000 (11:31 -0800)
Merge commit '5d26339aed33942ba82bfdb79e1b7e9a832c96a7' into eclair-mr2-plus-aosp

* commit '5d26339aed33942ba82bfdb79e1b7e9a832c96a7':
  DO NOT MERGE: backport the IPv6 NetworkInterface/multicast fixes.


Trivial merge