am ad99c287: am f1f26bbb: Merge change I7b8b6cfb into eclair

Merge commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b' into eclair-mr2-plus-aosp

* commit 'ad99c2876cf57a61829ac0b03ee48fa86a51da6b':
  Do not force screen on when undocking from the desk dock.
tree: a25c183b9ae2c75fb2c0c3dc5002a65928e1bd17
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE