tree c82a4131a95ac0de14efeb88fe937e3e2e19b799
parent 996637897c99d28a054bb0094717b36bbf3e8b59
parent bd825a7c910cafd07ebc48c28dded158f29767cc
author Elliott Hughes <enh@google.com> 1376411758 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376411758 -0700

am bd825a7c: am 9f178544: am 44e8930b: Bumper ZipFile/ZipEntry backport.

* commit 'bd825a7c910cafd07ebc48c28dded158f29767cc':
  Bumper ZipFile/ZipEntry backport.