am a229ceda: Merge change I73d6c0f8 into eclair

Merge commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992' into eclair-plus-aosp

* commit 'a229cedadd6c3b8ab7f2d8b7b45638753e834992':
  Add ability to disable sending Photos using Vcard. Do Not Merge