am 2ade6421: Merge change I775e1ec0 into eclair

Merge commit '2ade6421f2d6dd615b559c951deace7143958b90' into eclair-plus-aosp

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