tree 9b712b3293b5dd61302cbba603013a59d5e49c11
parent 3e20a7371863c7c2426be65864461752e7b4902f
parent ba5f10a565f0ba79bf72456852665e705de3b381
author Greg Hackmann <ghackmann@google.com> 1430155738 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430155738 +0000

am ba5f10a5: Merge "libziparchive: fix clang build"

* commit 'ba5f10a565f0ba79bf72456852665e705de3b381':
  libziparchive: fix clang build