tree 22147f867876adb8d6fa57daafffdb3eb82ff8d6
parent 2c28ae3933d4348655d7ba6d17ad33461aeabe26
parent 7969be603769af9dc3a28ab95dbb1cc4a3a8646f
author Tianjie Xu <xunchang@google.com> 1538776684 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1538776684 +0000

Merge changes from topic "am-88276146-0d74-467c-8b81-8d471d84ce66-nyc-mr2-dev" into oc-dev

* changes:
  [automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: 2050579b79
  DO NOT MERGE: Initialize the ZipArchive to zero before parsing