am 94140b35: Merge commit \'9284dec7\' into merge

Merge commit '94140b35541b955589f878ce6b26b65c3b3e18ac' into eclair-mr2-plus-aosp

* commit '94140b35541b955589f878ce6b26b65c3b3e18ac':
  Update VCardComposer getOwnerPhoneNumberVcard() to support empty vcard for 0.vcf