am dbb924c4: Merge change I700622d9 into eclair

Merge commit 'dbb924c493b8fffd8f7f0d2172953ba5c2b2c7a5' into eclair-mr2

* commit 'dbb924c493b8fffd8f7f0d2172953ba5c2b2c7a5':
  Fix up photo editing, and few other tweaks to contact editing.