tree 3134d761d82c458427c2d3e8b3155d57cd0213c5
parent f8c154f4b0b402968a911bf2c00ea40d252ccb60
parent 83af736f28c03bcac552f83bc645433925135c7e
author Jean-Baptiste Queru <jbq@google.com> 1345818600 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345818600 -0700

am 83af736f: am 5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"

* commit '83af736f28c03bcac552f83bc645433925135c7e':
  Fix reporting wrong error message for zipalign output file