am 07086eb9: Merge change Ifb63d236 into eclair-mr2
am 07086eb9: Merge change Ifb63d236 into eclair-mr2

Merge commit '07086eb9dd351f716843ddc4ff7afbd15d25d49c' into eclair-mr2-plus-aosp

* commit '07086eb9dd351f716843ddc4ff7afbd15d25d49c':
  Add cancel() VCardDataBuilder, which is intended to remove

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