tree 9708c4cabf0995ae461307fc5e65c5b8fb2426c6
parent a4ad73480896c6bc7960331dcfca87a358cc5782
parent 487d6d3db3f504b0120fc605ad3a4155ca214674
author Jean-Baptiste Queru <jbq@google.com> 1345565533 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345565533 -0700

am 487d6d3d: am 02fd2924: Merge "Fixed warnings test_zipfile"

* commit '487d6d3db3f504b0120fc605ad3a4155ca214674':
  Fixed warnings test_zipfile