tree b72aef5921fc91733111d1517b57093018794d54
parent 9386a33ea005fc008ff7ce0558d24e5ac68a6430
parent 3c1504d9d7d529b8281a447dc69af3ecf6b5ec83
author Elliott Hughes <enh@google.com> 1364232282 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1364232282 -0700

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

* commit '3c1504d9d7d529b8281a447dc69af3ecf6b5ec83':
  Stop generating <sys/linux-syscalls.h>.