Merge branch 'cm-11.0' of github.com:CyanogenMod/android_packages_apps_Dialer into kk

Conflicts:
	AndroidManifest.xml

Change-Id: I3f2a211036fe02b9f7151694868821b6cd1f2b10