tree 04b546abf18eb43c91ca22165e16919c294dc78b
parent aac97130e13b3d1d4f0f7eff18d03af4af0c794b
parent 4f483fb7c8e879513d3034c7d8c6528f1168a136
author Elliott Hughes <enh@google.com> 1359767263 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359767263 -0800

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

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '4f483fb7c8e879513d3034c7d8c6528f1168a136':
  Restore linux/elf-em.h.