tree e79127d4598a48191ffa776467aa13d7ca99dc68
parent 3222dc0d76ca0f19795df2aad417dec2293b7242
parent 35332d7c6280c77570e5d975281e447761d6b39b
author Tianjie Xu <xunchang@google.com> 1538777311 -0700
committer android-build-merger <android-build-merger@google.com> 1538777311 -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

Change-Id: I54660a0731148f1ebbe74d4412d333a9f956dcb1