Merge change 23582 into eclair

* changes:
  Expand apps' control over the settings restore process
tree: f47c585c457a7fed85f6a9d83c8d2b5de35ee9f1
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE