tree 819817009b8e46ad3510d3cc9e63072bbf0d58f0
parent 5686bb300304f5de0597f356c6da72b8a090a647
parent e7cb795cb639ef4e04b0417ebf4b16b12ea5dc4e
author Elliott Hughes <enh@google.com> 1363970506 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363970506 -0700

am e7cb795c: Merge "Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>."

* commit 'e7cb795cb639ef4e04b0417ebf4b16b12ea5dc4e':
  Replace unnecessary x86 uses of <sys/linux-syscalls.h> with <asm/unistd.h>.