Merge change 26103 into eclair

* changes:
  Handle restore of the original naive wallpaper backup schema
tree: 57b56f0c3df7489861197c5cfbe8ef48b923256b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE