tree b2e5db48135124c31b3f4aa8ad4c274a3e0255f5
parent 37bda6a004b7b4d22116cf27c086ccd6d5ed7c4c
parent 087bc0c7d380fafc41bcc76610bff17f433cecd2
author Tao Bao <tbao@google.com> 1484943357 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1484943357 +0000

Merge "imgpatch: Compile with ZLIB_CONST defined."