Merge remote-tracking branch 'remotes/aosp/jb-mr1.1-release' into jb42

Conflicts:
	res/values-de/strings.xml
	res/values/strings.xml
	src/com/android/phone/PhoneUtils.java

Conflicts:

	src/com/android/phone/PhoneUtils.java