tree 9d3067a9b5649d16fb41d18d7f69cdb9b861ceaa
parent ff26e25b51eb672a4c8244946e0f2b4328786f55
parent a9dd36702f4a9d65d084387050b688b8965b13b3
author Elliott Hughes <enh@google.com> 1359764377 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1359764377 -0800

am a9dd3670: Merge "Restore bionic\'s <linux/elf-em.h>."

# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit 'a9dd36702f4a9d65d084387050b688b8965b13b3':
  Restore bionic's <linux/elf-em.h>.