tree 47eb4c259a8eb8c844a7f93ad527f864b9ca056a
parent 0d4c0642ec4fbea3bd112437d2ed154979b33c29
parent d163c8eda25ff1c2e4de5a981331ab7e77aaeea1
author Jean-Baptiste Queru <jbq@google.com> 1345819130 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345819130 -0700

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

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