Merge change 25918 into eclair

* changes:
  Set intent_component of in-app shortcuts to app itself
tree: 5cdf6dc2a6dbef044330bfd24c8a5ae620ddff87
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE