tree 351b8e7940857864268654ee719ece32237be139
parent 75814dac913d390753c93d6440223d6c3c520190
parent 198c9b9be771a5b6f0bc1d5590eef1f0cd5dd08c
author Elliott Hughes <enh@google.com> 1347494524 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347494524 -0700

am 198c9b9b: am 02f7a784: am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."

* commit '198c9b9be771a5b6f0bc1d5590eef1f0cd5dd08c':
  Don't include <linux/socket.h> directly.