clean up
Merge github.com:ResurrectionRemix/android_packages_apps_Dialer into kitkat1

Conflicts:
	AndroidManifest.xml