tree 96119e77985cf9069b149a7a08bc345f45b06873
parent 65163750b11c814d6a75940ab1ede1e907b14d81
parent c019345a3a0f3ee8561e595917b75d6419ee4cc8
author Elliott Hughes <enh@google.com> 1363990026 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363990026 -0700

am c019345a: Merge "Use the correct names for the __ARM_NR_* syscalls."

* commit 'c019345a3a0f3ee8561e595917b75d6419ee4cc8':
  Use the correct names for the __ARM_NR_* syscalls.