tree c5ad3ec1fb20e23d326c43d25a2ffc70b1e8ce09
parent 2225c1f739e3755bc955e055a00efe682b4b2aff
author Greg Hackmann <ghackmann@google.com> 1402502666 +0000
committer Greg Hackmann <ghackmann@google.com> 1402502694 +0000

Revert "android: split private zlib into its own library"

This reverts commit 7989f56658ba0ac8b2950f5aa1fae9aa4e4e6cbf.

Change-Id: I6d4956bbdb92268d504ad5dfecc02a753f99a6cb