Merge branch 'qcril' of git://github.com/CyanogenMod/android_packages_apps_InCallUI into cm-11.0

Change-Id: Ic83e6800c6a5cc9238962d093e525d18201635a0