OSDN Git Service

(root) / android-x86 / frameworks-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f6468ca 2da0bbc)
am 2da0bbc8: (-s ours) DO NOT MERGE - Set the SO_BROADCAST option if the master elect...
authorJason Simmons <jsimmons@google.com>
Tue, 17 Jul 2012 23:15:53 +0000 (16:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 17 Jul 2012 23:15:53 +0000 (16:15 -0700)
* commit '2da0bbc80545769541e2a24e8ce152f0ea2a113c':
  DO NOT MERGE - Set the SO_BROADCAST option if the master election endpoint is the broadcast address


Trivial merge
frameworks/base
About OSDN
Find Software
Develop Software
Help