| commit | 40ad466e4e9669b43b72c4736ec9e8e27ddb5cfc | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Sep 12 11:06:56 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Sep 12 11:06:56 2012 -0700 |
| tree | 1b8f7b9a0fa159f723aa9828225c7d1e8d84549a | |
| parent | 53d1864c100ba6562b3077d662a063356b9584ce [diff] | |
| parent | 4c686dad83b6712e0e1abab6aba9c7bb683000b2 [diff] |
am 4c686dad: am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>." * commit '4c686dad83b6712e0e1abab6aba9c7bb683000b2': Include <sys/socket.h> instead of <linux/socket.h>.