commit | ad99c2876cf57a61829ac0b03ee48fa86a51da6b | [log] [tgz] |
---|---|---|
author | Mike Lockwood <lockwood@android.com> | Wed Nov 11 17:15:23 2009 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 11 17:15:23 2009 -0800 |
tree | 816ef42e7bd6122c7de1b1c0615fa47f55f20a13 | |
parent | d73f7de40e1bdd0d8aee1ee793db36e7a9f7d8cb [diff] | |
parent | f1f26bbb2aa36f69f0efcac21ea27b1055b98a11 [diff] |
am f1f26bbb: Merge change I7b8b6cfb into eclair Merge commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11' into eclair-mr2 * commit 'f1f26bbb2aa36f69f0efcac21ea27b1055b98a11': Do not force screen on when undocking from the desk dock.