Merge change 24662 into eclair

* changes:
  Fix URI returned by IccProvider.
tree: 8852fc48e4736acca8fe083769efd464fbccf3cd
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE