tree 39636830bb1ffb6e5434b8026cee24d811b65428
parent e1d2e3436e0f0301f7acba9971f760fefc9036ae
parent 390f3b364caf7de728c4719432a1875f14c32455
author Adam Lesinski <adamlesinski@google.com> 1490303103 +0000
committer android-build-merger <android-build-merger@google.com> 1490303103 +0000

Merge "libziparchive: fix mac os breakage"
am: 390f3b364c

Change-Id: Ib7e882634636f74092487766f4abc8d969b0468a