am 7235e015: am 4b5e7d90: Merge change 25874 into eclair
am 7235e015: am 4b5e7d90: Merge change 25874 into eclair

Merge commit '7235e015acb796f247fc18975b6438d6543f95ee'

* commit '7235e015acb796f247fc18975b6438d6543f95ee':
  ContactsContract: Adding joined columns to the CommonDataKind class definitions.

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