am 72c0d293: am 763ccae7: (-s ours) Merge change I8e7f5f07 into eclair

Merge commit '72c0d293793bfacb0ad9ebcefec305cca7e5dd2e' into eclair-mr2-plus-aosp

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