tree b62ff1bfaf31baa011a79343d2bad619857bd11e
parent 3b9865faa9008e2c57485eac3724ea68ff8e5a0f
parent 6d6673314cbde915e6f669cf6056344757294ea6
author Jayant Chowdhary <jchowdhary@google.com> 1495733313 +0000
committer android-build-merger <android-build-merger@google.com> 1495733313 +0000

Merge "Mark libziparchive vendor_available." am: e0ee6d31fd am: 55a59f9906
am: 6d6673314c

Change-Id: I5f81256ca1c6c957322dcef8777f69cbfa1d61b7