am 0100fae1: Merge change I1f7c409e into eclair
am 0100fae1: Merge change I1f7c409e into eclair

Merge commit '0100fae14ff12c36eeff07b94cdea5f8756837aa' into eclair-plus-aosp

* commit '0100fae14ff12c36eeff07b94cdea5f8756837aa':
  Make ContactStruct handle Collection properly.

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