tree d10f18f1a15c719694e4cc4b94a21c5943ee3435
parent 71c06eb1f733b4afed3698566477a97487ed22aa
parent 0d63468171a80bd84a859fbd36b8d874f030c764
author Tianjie Xu <xunchang@google.com> 1456255813 +0000
committer android-build-merger <android-build-merger@google.com> 1456255813 +0000

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

* commit '0d63468171a80bd84a859fbd36b8d874f030c764':
  Surpress warnings in minzip/Zip.c