| commit | 092a4128310076d918a20d09d48e6b86a8cd38b0 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Oct 30 23:56:46 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 30 23:56:46 2014 +0000 |
| tree | 8040046cbcaff88933e456577fb6e2f54d2580da | |
| parent | 63546cddccc29ce568e1a87a5c1236c154864f40 [diff] | |
| parent | 8cca2fc34d04fa6eb75f019270696665785a3c8a [diff] |
am 8cca2fc3: Merge "HAVE_ZLIB_H wrongly overrides LIBXML_ZLIB_ENABLED." * commit '8cca2fc34d04fa6eb75f019270696665785a3c8a': HAVE_ZLIB_H wrongly overrides LIBXML_ZLIB_ENABLED.