tree 5d114e523cbe6009968b219c0893244009ecb514
parent 583211fda8b1d8b94ac24dd228f30b9f3503d9a1
parent d565791caf490dbb2632f62c32a700d6805d6df3
author Elliott Hughes <enh@google.com> 1360006167 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360006167 -0800

am d565791c: am 4f483fb7: Merge "Restore linux/elf-em.h."

# Via Android Git Automerger (1) and others
* commit 'd565791caf490dbb2632f62c32a700d6805d6df3':
  Restore linux/elf-em.h.