tree 5936be8505fc8b9fe71dce884b4800963486c07b
parent efdf7862be41b2dfd8d013e2495af9a2db5286f5
parent b8e82b5e729a1f6e30ee9593b2dbcbb3ad623874
author Elliott Hughes <enh@google.com> 1405129311 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1405129311 +0000

am b8e82b5e: Merge "EM_ARM and EM_AARCH64 are now in the uapi header."

* commit 'b8e82b5e729a1f6e30ee9593b2dbcbb3ad623874':
  EM_ARM and EM_AARCH64 are now in the uapi header.