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