tree 9634d328c78c615aaf8969b54e635b4d8bd26768
parent 8118cd83a2d0372fdf34fe606fa0171632ff7a4e
parent 6b637b605dfb9cbd6bf77e0f86d28867fa08ee58
author Narayan Kamath <narayan@google.com> 1495215293 +0000
committer android-build-merger <android-build-merger@google.com> 1495215293 +0000

Revert "Update zlib to 1.2.11" am: 20877b3d8f
am: 6b637b605d

Change-Id: I51dff489ed02e981ddac23eb1098d43c784d6e5f