tree b2e5db48135124c31b3f4aa8ad4c274a3e0255f5
parent 9bb0819ef64f6a859dfd5a9dea06ae312fa5ed27
parent e78ca37656d72d10952727c20f20c5044b4b3db0
author Tao Bao <tbao@google.com> 1484943584 +0000
committer android-build-merger <android-build-merger@google.com> 1484943584 +0000

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

Change-Id: I636cfadd456cb6e256049a23f70e3a7a71c70d78