am 78e9389a: am f66e2e24: Merge change 23344 into eclair
am 78e9389a: am f66e2e24: Merge change 23344 into eclair

Merge commit '78e9389a213df93a2e1d55b9961ce8aa103e7301'

* commit '78e9389a213df93a2e1d55b9961ce8aa103e7301':
  Make vCard composer handle null of Photo entry correctly.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base