tree 7ef50d3aa01b54cae65b65fd43e2c9bbdeb7f34a
parent ddda044a81b6be2ccdf351ad5c9a2b9800a60f5f
parent bc0d7f736c2c66868844f2b5c9e6507d3e7a7982
author Elliott Hughes <enh@google.com> 1363970608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363970608 -0700

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

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