Merge branch 'qcril' of git://github.com/CyanogenMod/android_packages_apps_ContactsCommon into cm-10.2