Merge commit 'ad479513541821012ca8ed9be288871976b24a02' * commit 'ad479513541821012ca8ed9be288871976b24a02': ContactsContract: Adding joined columns to the Data class definition.
Merge commit 'ad479513541821012ca8ed9be288871976b24a02' * commit 'ad479513541821012ca8ed9be288871976b24a02': ContactsContract: Adding joined columns to the Data class definition.