tree 0aa1020d71e0fb9953bf5b6d4efd964dae538db4
parent 3735bb6d385e60cacb8101fb13837cf3cb330d3e
parent 8157166107913f800c3bcd67c80372251cb42e12
author Tao Bao <tbao@google.com> 1484944063 +0000
committer android-build-merger <android-build-merger@google.com> 1484944063 +0000

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

Change-Id: I122904cb52fa214dba468e43afb17e55aafd0039