tree 7f79bfe63042120a3bc32257f890df707ec93084
parent 93f3811b744b2100d0f259916876965c242cd3d9
parent 48f25cef45f8f68567d528a5d833ed45cb760bec
author Elliott Hughes <enh@google.com> 1364232163 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364232163 -0700

am 48f25cef: Merge "Stop generating <sys/linux-syscalls.h>."

* commit '48f25cef45f8f68567d528a5d833ed45cb760bec':
  Stop generating <sys/linux-syscalls.h>.