Mike Lockwood bc12b0260b am f1f26bbb: Merge change I7b8b6cfb into eclair ...

Merge commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11' into eclair-plus-aosp

* commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11':
  Do not force screen on when undocking from the desk dock.

2009-11-11 15:39:57 -08:00

..

server

am f1f26bbb: Merge change I7b8b6cfb into eclair

2009-11-11 15:39:57 -08:00