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