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