tree 0bc5efbd89590987e5366c6f0ecb6284444ffae2
parent d1d19baf0ca1658dc4eb7af176a6fba19f315a6c
parent bba4ff7c38e7e6837fabdb225cdb24d12a17eabc
author Trevor Johns <tjohns@google.com> 1260386915 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1260386915 -0800

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

Merge commit 'bba4ff7c38e7e6837fabdb225cdb24d12a17eabc' into eclair-plus-aosp

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