Merge change 25800 into eclair

* changes:
  ContactsContract: Adding joined columns to the Data class definition.