tree 50d20b176cebaa955f3d64f0bbbe5d181f3f6914
parent 3077d88347f4b120ee93e73efdbfb017e0e968ec
parent 01c0e19e426df5620c5ca822ab546907dbf1fa7d
author Elliott Hughes <enh@google.com> 1363921102 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363921102 -0700

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

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