2cd22586ab
Merge commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b' into eclair-mr2-plus-aosp * commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b': Do not force screen on when undocking from the desk dock.