OSDN Git Service

am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."
authorElliott Hughes <enh@google.com>
Wed, 12 Sep 2012 15:55:32 +0000 (08:55 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 Sep 2012 15:55:32 +0000 (08:55 -0700)
* commit 'fbe1cc92d9e8930700c15f68717dd66fc1523177':
  Don't include <linux/socket.h> directly.


Trivial merge