tree c8bb24f9668f635e3737bffdd08293cf07fa85e0
parent e3479ea5033e2ede36f6f771dd3a6ea315505efd
parent 5ac65f869601df5e73fb84b67e57af8ef95cc3bf
author Jean-Baptiste Queru <jbq@google.com> 1345759755 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345759755 -0700

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

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