Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp * commit 'b18b0956afbe0730ced1c5b95c0071dba447765e': Revert "ContactsContract: Adding joined columns to the Data class definition."
Merge commit 'b18b0956afbe0730ced1c5b95c0071dba447765e' into eclair-plus-aosp * commit 'b18b0956afbe0730ced1c5b95c0071dba447765e': Revert "ContactsContract: Adding joined columns to the Data class definition."