am 5bb200fd: am 2ade6421: Merge change I775e1ec0 into eclair

Merge commit '5bb200fde2306d9da1972a81c0238c26ca6f475b' into eclair-mr2-plus-aosp

* commit '5bb200fde2306d9da1972a81c0238c26ca6f475b':
  Debugging for issue #2250075: Desk dock clock app sometimes doesn't