tree 28f3df52e7121d7ad862794e6d60891d8336a41a
parent b3e2cc46ae3a0bdbff39313b1d17bee1763d18c8
parent 9f1785441b6e81fe158b735c089758fde3b657ed
author Elliott Hughes <enh@google.com> 1376411608 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1376411608 -0700

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

* commit '9f1785441b6e81fe158b735c089758fde3b657ed':
  Bumper ZipFile/ZipEntry backport.