tree be8822d5c6698b028b963c6d846bf5f190d39fc5
parent 580154d6b92a7d3b5f1919f363aed96e3d5d440e
parent 03baf5eab896198b5060d287af3fd60d360bf48f
author Elliott Hughes <enh@google.com> 1405731110 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405731110 +0000

am 03baf5ea: Merge "Always include <sys/...>, not <linux/...>."

* commit '03baf5eab896198b5060d287af3fd60d360bf48f':
  Always include <sys/...>, not <linux/...>.