tree d0ff1850afc0fc757ed674222b143160404c8ce1
parent 723056a83f8c8b15af02d9c302862dbb2304ea8c
parent 274945cb5b446c690f6c5df54467c28082d32c2e
author Tianjie Xu <xunchang@google.com> 1538777911 -0700
committer android-build-merger <android-build-merger@google.com> 1538777911 -0700

[automerger skipped] DO NOT MERGE: Initialize the ZipArchive to zero before parsing skipped: e830a51351 skipped: 244aba4412 skipped: 9216bccd16 skipped: 98acdb9fce skipped: bc42a6b0eb am: 35332d7c62 am: 6b13f89f15
am: 274945cb5b  -s ours

Change-Id: Ic5569d0abf7674ca5bee1b3df01170e69b6a0c1d