Merge change 25232 into eclair

* changes:
  Fix NPE when provider returns null cursor.
tree: ebc73fd0eb5acb10d974d841a2242161d94a9d77
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE