tree 21f8f9c9ecb3dadc3fe54e67ce442caadc4854a7
parent bc0d7f736c2c66868844f2b5c9e6507d3e7a7982
parent 5c5f303e4c661a71ae8e4c7fd99fc7674360321e
author Elliott Hughes <enh@google.com> 1363970506 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363970506 -0700

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

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