tree c0fa614c4c06b9604387a07fcd8bb41a345cec07
parent 51a1d4e3f629f9a9a20a0c2a04c4f2a7507ee48c
parent ac3ab308f657f70e2747734d5ff2158aa943b25e
author Narayan Kamath <narayan@google.com> 1386354727 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386354727 -0800

am ac3ab308: Merge "Fix Mac OS build for libziparchive."

* commit 'ac3ab308f657f70e2747734d5ff2158aa943b25e':
  Fix Mac OS build for libziparchive.