tree 3ecbd551aed4fc4d7f94b8077a25f5a9b0964bfc
parent 47e9ffdbd977e3b45a08ffd3c2b261616f4354bb
parent badfa869518949bff61c00e8f711daa38c2e9fa5
author Elliott Hughes <enh@google.com> 1558470297 -0700
committer android-build-merger <android-build-merger@google.com> 1558470297 -0700

Merge "libstagefright: track libziparchive API change."
am: badfa86951

Change-Id: I72e7f99937172a7024ee344fc7e625518ca0d24f