am 9d995d67: am 1cc09402: am f6721978: Merge "Fix x86 build to use <elf.h>."

# Via Android Git Automerger (2) and others
* commit '9d995d67217e44e022c9e5d0767634fa81f87b78':
  Fix x86 build to use <elf.h>.
This commit is contained in:
Elliott Hughes 2013-01-29 17:09:13 -08:00 committed by Android Git Automerger
commit 278c059663

View File

@ -26,8 +26,8 @@
* SUCH DAMAGE.
*/
#include <elf.h>
#include <sys/types.h>
#include <linux/elf.h>
#include <link.h>
/* Dynamic binaries get this from the dynamic linker (system/linker), which