am 8e724905: am ad6731b0: Merge "Add debugging to ZipFileRO" into gingerbread

Merge commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d'

* commit '8e724905261bf4913bac75adc64fb08ed5ba8b7d':
  Add debugging to ZipFileRO