tree f7b7085488b6d2cc510b1fbc8cd06a1a717fd263
parent 70a5967e0bb295f64c99593043f138fdd62365f4
parent cceed1dfe13e99c4ffdc2586bff22d325a57c599
author Elliott Hughes <enh@google.com> 1347473085 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347473085 -0700

am cceed1df: Merge "Include <sys/socket.h> instead of <linux/socket.h>."

* commit 'cceed1dfe13e99c4ffdc2586bff22d325a57c599':
  Include <sys/socket.h> instead of <linux/socket.h>.