Merge change 25853 into eclair

* changes:
  Don't back up / restore certain sync-related settings
tree: b496dec29c4d98a9fe26eeee7d9cd786b32b2bca
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE