am a8c8fd19: am dbb924c4: Merge change I700622d9 into eclair

Merge commit 'a8c8fd19314c2b1dd72a00ec922b98cff911b943' into eclair-mr2-plus-aosp

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