tree 281cb015792719db04ab07898788faabeb260259
parent 0e309c87ab2b2ae47583240d8a0bfe326471ec62
parent 3eb08b0e298e5b283add3a6a1abf0026d7cbcd98
author Elliott Hughes <enh@google.com> 1385057733 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385057733 -0800

am 3eb08b0e: am f4e03b03: am bf652a5f: Merge "Provide <sys/user.h>."

* commit '3eb08b0e298e5b283add3a6a1abf0026d7cbcd98':
  Provide <sys/user.h>.