tree 8dee3f412d6e27e2813da84442379175c6ec5da2
parent 4b7e5854847354de1e091ff038f70fd11be52d9e
parent e4da3f1917eaf5233bfde1f98b8e6ca87be37401
author Dan Willemsen <dwillemsen@google.com> 1506679675 +0000
committer android-build-merger <android-build-merger@google.com> 1506679675 +0000

Merge "Rename libz-host -> libz" am: 944c4ea526 am: 9e278d6b1a am: fd69531142
am: e4da3f1917

Change-Id: I6f89bd9c24ad4d559379ab45e4140076ab50761d