tree 1ca0132abeffaf25ae8a780e5533ffde5050ba82
parent 9af09c0505ed52d5aaa8a8bf9accd942a4303260
parent 6a82bc228a1001990d7fe95e36f52c37125d93cf
author Tao Bao <tbao@google.com> 1484943883 +0000
committer android-build-merger <android-build-merger@google.com> 1484943883 +0000

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

Change-Id: I8e1687131deca82302246fd4f05d0f6e48c5301f