tree 8a5f9e7b325f15a26be84a6c2ba5aad405dc5d97
parent f41d08aeb3d3c02b1651c6122c4236c585d9a6d1
parent a2132f23b8056f00d46e67db03d257d4bce2881a
author Elliott Hughes <enh@google.com> 1580232129 -0800
committer android-build-merger <android-build-merger@google.com> 1580232129 -0800

Merge "elf.h: move all the Android extensions together."
am: a2132f23b8

Change-Id: I2c4cca7757a9803ecaa12a8e675ad50c21924ac1