tree b2ee4bb8f16216a33fd4eae2acaf7a2edd6a5f8f
parent 900afe69b3b37fccccda912fccff6859b88de976
parent ce252a75e4a3e03f0bf947bf74a1a79ae1b1cfa1
author Elliott Hughes <enh@google.com> 1509550669 +0000
committer android-build-merger <android-build-merger@google.com> 1509550669 +0000

Merge "bionic now has ElfXX_Chdr..." am: 0cb208dc6f
am: ce252a75e4

Change-Id: Ibb917945f2c4a3d8bdcfee1722bc2a92e47a9381