Merge change 24607 into eclair

* changes:
  Try not to crash the system server because of corrupt restore data
tree: a418bc34575e74fbc48bf278058a61a4b2de5f73
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE