am 41d53ed1: Merge change I638d3f45 into eclair-mr2

Merge commit '41d53ed121dbe8932065e099477a0bcb8aae5265' into eclair-mr2-plus-aosp

* commit '41d53ed121dbe8932065e099477a0bcb8aae5265':
  Enable some special debug url.