tree 56171fc012d0eb9192552a26f85d148a777afc2c
parent c48968d268820ee64986f738e227910b29290eab
parent 612333f671a59d98fad6f594f5bf657dbd6c9c4d
author Elliott Hughes <enh@google.com> 1363920998 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363920998 -0700

am 612333f6: Merge "Don\'t #define SYS_ constants unless they make sense for the current architecture."

* commit '612333f671a59d98fad6f594f5bf657dbd6c9c4d':
  Don't #define SYS_ constants unless they make sense for the current architecture.