Merge change 22534 into eclair

* changes:
  ContactsContract: Fix null pointer exception in openContactPhotoInputStream()
tree: 62e649edc75606446a21834b7cf293fdf1cb4c0b
  1. awt/
  2. camera/
  3. cmds/
  4. include/
  5. libs/
  6. opengl/
  7. vpn/
  8. MODULE_LICENSE_APACHE2
  9. NOTICE