tree 41153c2cf207a5dc3850fa36bf3d27a7055f1e8d
parent 3744ddfa36deaed303401d5faec18a40daac8e28
parent 4eb4ed2d19c498998bb9560c71873fa6657d0644
author Trevor Johns <tjohns@google.com> 1260492906 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260492906 -0800

am 4eb4ed2d: am bba4ff7c: Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to ContactsContract.Contacts._ID.

Merge commit '4eb4ed2d19c498998bb9560c71873fa6657d0644' into eclair-mr2-plus-aosp

* commit '4eb4ed2d19c498998bb9560c71873fa6657d0644':
  Fixing crash in ContactManager: Changing ContactsContract.Contacts.LOOKUP_KEY to