| commit | 4c686dad83b6712e0e1abab6aba9c7bb683000b2 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 12 11:04:45 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 11:04:45 2012 -0700 |
| tree | f7b7085488b6d2cc510b1fbc8cd06a1a717fd263 | |
| parent | 70a5967e0bb295f64c99593043f138fdd62365f4 [diff] | |
| parent | cceed1dfe13e99c4ffdc2586bff22d325a57c599 [diff] |
am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." * commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599': Include <sys/socket.h> instead of <linux/socket.h>.