Merge commit 'android-4.2.2_r1' into mr1.1-staging

Conflicts:
	res/layout/quickcontact_photo_container.xml
	res/values-bg/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-hu/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values/strings.xml
	src/com/android/contacts/dialpad/DialpadFragment.java

Change-Id: I6b5a1b584fa17e6b75a6fe2a04b19661cc150513