tree 1ca0132abeffaf25ae8a780e5533ffde5050ba82
parent 87f49b83caa6b40ec8c8ae2a2e89c598ce6d233a
parent ca261d3b48ec38f30b4e7ed38b8a11b7a3f02df2
author Tao Bao <tbao@google.com> 1484943733 +0000
committer android-build-merger <android-build-merger@google.com> 1484943733 +0000

Merge "imgpatch: Compile with ZLIB_CONST defined." am: e78ca37656
am: ca261d3b48

Change-Id: I0278ded6acb4c003c65cb6b71b7b52a7824fe2fc