tree ae365ea8ec66b1feb7770cf4e69958ec2bd76389
parent 24b3622933092c7227a391939f3f1cdcd3d7c999
parent 4b3cdce702fefa7eac0626f57d09ff018127c191
author Tianjie Xu <xunchang@google.com> 1456255511 +0000
committer android-build-merger <android-build-merger@google.com> 1456255511 +0000

Merge "Surpress warnings in minzip/Zip.c"
am: 4b3cdce702

* commit '4b3cdce702fefa7eac0626f57d09ff018127c191':
  Surpress warnings in minzip/Zip.c