tree 812797d81b655ecef246a48c6f06dc5a49285786
parent af243f274341e461592448606cf1efa577e22c28
parent 77813b7ffec698449a9294147aa9c3ae1385ccac
author Chih-Hung Hsieh <chh@google.com> 1506725868 +0000
committer android-build-merger <android-build-merger@google.com> 1506725868 +0000

Merge "Use -Werror in external/zlib"
am: 77813b7ffe

Change-Id: Ic752523752a067dd6ac57e34fd79056d377ec203