tree c6aa888eb8150038850dc9195f20e13305c1c278
parent a0dcecc53e2f45939fdcb0f1ec1d592d91cf41c7
parent b80a05fa678b287f46dc596353d285a9a7d09fbc
author Elliott Hughes <enh@google.com> 1363970608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363970608 -0700

am b80a05fa: am 5c5f303e: Merge "Replace unnecessary MIPS uses of <sys/linux-syscalls.h> with <asm/unistd.h>."

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