tree e4f77f531ce660ee1938d9d161c50e302e1c6eb9
parent adf25974a44503066df61cc0be515395fd7253b6
parent 44e8930b48015aacbad027c5a8d9a4c7e00e329e
author Elliott Hughes <enh@google.com> 1376411422 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376411422 -0700

am 44e8930b: Bumper ZipFile/ZipEntry backport.

* commit '44e8930b48015aacbad027c5a8d9a4c7e00e329e':
  Bumper ZipFile/ZipEntry backport.