Merge change I49c9a3a3 into eclair

* changes:
  Fix bug 2325244	screen turns black for a brief period of time
tree: 9d4864f4a6ca7ba7f575a0e3db96319bb52fa7ff
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE