Merge commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29' into eclair-plus-aosp * commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29': Adding timestamp and account to contact-level presence columns.
Merge commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29' into eclair-plus-aosp * commit 'f22fc124ff7974d0b6380199f7d53e66bb7feb29': Adding timestamp and account to contact-level presence columns.