tree 422f8378234a94a15fd5687517aca02825fb1c85
parent 0e69ba70b5be26ebe0fb94b4fd2140e2277aa71e
parent 9b5f044fd00f8b1d49a14c1a1faed69b3dde200b
author Mark Salyzyn <salyzyn@google.com> 1399591170 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1399591170 +0000

am 9b5f044f: Merge "libziparchive: 64 bit issues"

* commit '9b5f044fd00f8b1d49a14c1a1faed69b3dde200b':
  libziparchive: 64 bit issues