tree b381cb36fb2112c92cd38dd93fb6511570f6c3dd
parent 4da74b3dfbdf51039bd250f4c6213d6eeaf629b8
parent b5a1a4a7728250a6f77ec00d00df29c68985fbdd
author Colin Cross <ccross@android.com> 1472243137 +0000
committer android-build-merger <android-build-merger@google.com> 1472243137 +0000

Merge "Replace libziparchive-host with libziparchive"
am: b5a1a4a772

Change-Id: Ic4b372e601b2e66aef25c3c2b536fce86547657c