am 993844bd: Merge change 22806 into eclair

Merge commit '993844bde5270f004aa504c879aa2e99b5c3765f' into eclair-plus-aosp

* commit '993844bde5270f004aa504c879aa2e99b5c3765f':
  Add trailing "\n" to debug output.