Merge change Id6c0b844 into eclair

* changes:
  Unbreak setting photos as wallpaper
tree: 22f92248e9be2141e93e38f657a5aa9ffd2b10a8
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE