Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp * commit '4b5e7d908bfda633fea72f5d20dae63328019c93': ContactsContract: Adding joined columns to the CommonDataKind class definitions.
Merge commit '4b5e7d908bfda633fea72f5d20dae63328019c93' into eclair-plus-aosp * commit '4b5e7d908bfda633fea72f5d20dae63328019c93': ContactsContract: Adding joined columns to the CommonDataKind class definitions.