tree 8040046cbcaff88933e456577fb6e2f54d2580da
parent 63546cddccc29ce568e1a87a5c1236c154864f40
parent 8cca2fc34d04fa6eb75f019270696665785a3c8a
author Elliott Hughes <enh@google.com> 1414713406 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414713406 +0000

am 8cca2fc3: Merge "HAVE_ZLIB_H wrongly overrides LIBXML_ZLIB_ENABLED."

* commit '8cca2fc34d04fa6eb75f019270696665785a3c8a':
  HAVE_ZLIB_H wrongly overrides LIBXML_ZLIB_ENABLED.