tree ea3b24432d5f8658b5fdb745713a75a4d342043d
parent 16ef1585d7abdaeb7592c7c9a0539904e131a2bf
parent 984bccf4ba3edad8ac4616ce96ac6552bb7d1e06
author Chih-hung Hsieh <chh@google.com> 1453750783 +0000
committer android-build-merger <android-build-merger@google.com> 1453750783 +0000

Merge "Include libz for new libelf." am: 5491d489fe
am: 984bccf4ba

* commit '984bccf4ba3edad8ac4616ce96ac6552bb7d1e06':
  Include libz for new libelf.