tree 752ee6199d6e736ca61ed24e66d66a2cfe552cf5
parent 381716e9396b55b1adb8235b020c37344f60ab07
parent 2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f
author Elliott Hughes <enh@google.com> 1279555365 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279555365 -0700

am 2ef2b5f9: Upgrade to zlib 1.2.5.

Merge commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f' into dalvik-dev

* commit '2ef2b5f9fd3e2ef2819ed6e915ac4d6a93efb62f':
  Upgrade to zlib 1.2.5.