tree 91ed93092bacff4cb80bf0f712fffdc59967f33f
parent b80a05fa678b287f46dc596353d285a9a7d09fbc
parent 34895c1bdfa5df48ee9a7b4368b6def403f24cf1
author Elliott Hughes <enh@google.com> 1363975197 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363975197 -0700

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

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