tree 70eab301839fa3532a8605be8e8f690b7d2a12d0
parent f591bbc247cf3535c8b5e162058769db4aa3d4af
parent 48a6d3de590714f4e913c6cc3135a455126df91d
author Narayan Kamath <narayan@google.com> 1386354819 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1386354819 -0800

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

* commit '48a6d3de590714f4e913c6cc3135a455126df91d':
  Fix Mac OS build for libziparchive.