Merge branch 'eclair' of github.com:cyanogen/android_packages_apps_Contacts into eclair