tree 389092fa269a8ca7e5141fa7e902644ba14dc73f
parent 4019963b9636935652ed458725c0f3d201d3a873
parent 8c8bb250890f76ff2fb71d50aad213e19914aaf0
author Colin Cross <ccross@android.com> 1472243544 +0000
committer android-build-merger <android-build-merger@google.com> 1472243544 +0000

Merge "Replace libziparchive-host with libziparchive" am: 611e205bbe
am: 8c8bb25089

Change-Id: Iaa10133cfcf424d82f170bf5b8b21487a982e5fb