| commit | b3212a62b3cc4706df9884f4a63a9ebaa45e0cf6 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Dec 04 11:30:00 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 04 11:30:00 2009 -0800 |
| tree | a4bddc9e229ed3ed82e7201e6535ab04f2b92740 | |
| parent | ad29a5c0b1f75b6a8d950937233d909221e83245 [diff] | |
| parent | b90871f4c638ce83137adea74b66dd3eca907cfe [diff] |
am b90871f4: (-s ours) am 5d26339a: DO NOT MERGE: backport the IPv6 NetworkInterface/multicast fixes. Merge commit 'b90871f4c638ce83137adea74b66dd3eca907cfe' * commit 'b90871f4c638ce83137adea74b66dd3eca907cfe': DO NOT MERGE: backport the IPv6 NetworkInterface/multicast fixes.