Merge change I8e7f5f07 into eclair

* changes:
  DO NOT MERGE: Fix loss of focus after wakeup into incall screen
tree: 4f8f026b39747f222be6ffe10d89ff1e6086e89a
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE