Merge change 26379 into eclair

* changes:
  Add parameter for the restore set (device id) data is being restored from to the restore_start event
tree: 04beef6db39d8a504289cd4ca46e49cfada98618
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE