Merge branch 'donut' of git@github.com:cyanogen/android_packages_apps_Contacts into donut