tree c4ce2af7dd9d6be23399166952f6c75e999428e2
parent da630f38d28f24e30eeaf7796ecd8d64e0784428
parent 81c23f3cfe64fc63bf7e5fadf86d08f44d5306df
author Elliott Hughes <enh@google.com> 1417733115 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1417733115 +0000

am 81c23f3c: Merge "Use __arm__ instead of ARCH_ARM."

* commit '81c23f3cfe64fc63bf7e5fadf86d08f44d5306df':
  Use __arm__ instead of ARCH_ARM.