am 1150e818: (-s ours) am 395a20ae: am a229ceda: (-s ours) Merge change I73d6c0f8 into eclair

Merge commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4'

* commit '1150e818727d9a0620ecd5c5f7ef40ce0078c7f4':
  Add ability to disable sending Photos using Vcard. Do Not Merge
This commit is contained in:
Jaikumar Ganesh
2009-11-02 16:10:11 -08:00
committed by Android Git Automerger

Diff Content Not Available