tree e2d8052b77227eb6c3a0a5bf7cd4f1d38a437dd2
parent 57bda47408e8a78aab25a2d258aaf01b55d0058a
parent a266c53361b7037107f6993230f9ac3c54d9bcf6
author Jean-Baptiste Queru <jbq@google.com> 1327695634 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1327695634 -0800

am a266c533: am 6f722d48: Merge "Fixed error in ApkBuilderTask for jar files with resources"

* commit 'a266c53361b7037107f6993230f9ac3c54d9bcf6':
  Fixed error in ApkBuilderTask for jar files with resources