2c6ca2676a
Merge commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59' into eclair-plus-aosp * commit 'de71cb3b6f3a7484402e2288ddfaad3ea3821f59': ContactsContract: Adding joined columns to the Data class definition.