tree b342f36f1f6d629e504a45f212984d867aef2967
parent 4fe95effe5e2413ab340e4ca6f37ca2498072696
parent 8ab9ece2e9c6e246f66357c800d6d1ba61becc00
author Elliott Hughes <enh@google.com> 1385082465 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385082465 -0800

am 8ab9ece2: am 162c9a24: Merge "Switch MIPS over to <sys/user.h>."

* commit '8ab9ece2e9c6e246f66357c800d6d1ba61becc00':
  Switch MIPS over to <sys/user.h>.