Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp * commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3': API to combine LOOKUP_KEY and Contacts._ID together.
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp * commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3': API to combine LOOKUP_KEY and Contacts._ID together.