Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp * commit 'b58b27142a936aa76897a7040c08b8a0989a685b': ZipFileRO: moar logging and wrap close
Merge commit 'b58b27142a936aa76897a7040c08b8a0989a685b' into gingerbread-plus-aosp * commit 'b58b27142a936aa76897a7040c08b8a0989a685b': ZipFileRO: moar logging and wrap close