| commit | 71cac13beaf6bb01e0cd8bb58273ccc9b8cbda87 | [log] [tgz] |
|---|---|---|
| author | Jason Simmons <jsimmons@google.com> | Tue Jul 17 16:15:53 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 17 16:15:53 2012 -0700 |
| tree | 34451fed491a9b94500990727cec18b283ba9c59 | |
| parent | f6468ca4dc66c48098874d12f605e14ba77b93e5 [diff] | |
| parent | 2da0bbc80545769541e2a24e8ce152f0ea2a113c [diff] |
am 2da0bbc8: (-s ours) DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address * commit '2da0bbc80545769541e2a24e8ce152f0ea2a113c': DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address