am b80d1d0c: am afbf8afa: Merge change I564b5b00 into eclair-mr2

Merge commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a'

* commit 'b80d1d0cc8b75b9e51c94169892f1d03cdcd788a':
  add "junk path" -k option to aapt