am 375b8016: am bbdba641: Merge change Icae1a990 into eclair-mr2
am 375b8016: am bbdba641: Merge change Icae1a990 into eclair-mr2

Merge commit '375b80162f58d93d8aef055a1ca1d42964132708'

* commit '375b80162f58d93d8aef055a1ca1d42964132708':
  Adding NAME_RAW_CONTACT_ID column to Contacts.

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