tree 1422024a19eae60caa2c60c5cf532ca27d203a30
parent 559a6d1d2ae2e5145641e1eb16e2c015d756d8c9
parent 6b13f89f1528705f91578a399590bba76278e1e2
author Tianjie Xu <xunchang@google.com> 1538777617 -0700
committer android-build-merger <android-build-merger@google.com> 1538777617 -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

Change-Id: Iecb9ede3a76664e15fc2b533b20571c8052ed4ba