tree 6003da94d6b463b32981b0d74b02658ac8e24268
parent 05e142c753df5fa37d0ce852807569d1cab522f7
parent 70d41c5181a496e4ac4129f06b95a9b9486e6a43
author Tianjie Xu <xunchang@google.com> 1538778455 -0700
committer android-build-merger <android-build-merger@google.com> 1538778455 -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 am: 71b2447163
am: 70d41c5181  -s ours

Change-Id: I1882cd594c7708753f88ca0bad6e026ec1cc498a