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.
tree: 1de0bdf145436d2ce71bb665124fc24871ace417
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE