tree b2ee4bb8f16216a33fd4eae2acaf7a2edd6a5f8f
parent 20da257d3834dfcc1e9477744b803cc957c3efe8
parent 0cb208dc6f72565a8a2ee12ad503ca942f1c09f4
author Elliott Hughes <enh@google.com> 1509550538 +0000
committer android-build-merger <android-build-merger@google.com> 1509550538 +0000

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

Change-Id: I7c69c87d4d0e203b37af4bd411f1663c71ba886d