| commit | 2e32a8902f68170ac04960517d5311f9a52a6adf | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Tue Aug 13 14:51:28 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Aug 13 14:51:28 2013 -0700 |
| tree | e4bf4ba82e2089ec32e00f5fa3f951d8db0f916a | |
| parent | 1e93f6737ef1a3540c8ce19c4fe3fa2efcdc1c78 [diff] | |
| parent | b70d0551100794ca2687bec0115571f9fab52fe4 [diff] |
am b70d0551: (-s ours) resolved conflicts for merge of 465008a4 to jb-mr2-dev-plus-aosp * commit 'b70d0551100794ca2687bec0115571f9fab52fe4': Bumper ZipFile/ZipEntry backport.