reset
Merge branch 'jellybean' of https://github.com/JBMiniProject/android_packages_apps_Contacts into jellybean

Conflicts:
	res/layout/dialpad_fragment.xml