Merge branch 'ics-mr1-release' of...

Merge branch 'ics-mr1-release' of https://android.googlesource.com/platform/frameworks/base into aosp

Conflicts:
	core/res/res/values-de/strings.xml
	core/res/res/values-el/strings.xml
	core/res/res/values-nl/strings.xml
	core/res/res/values-pt/strings.xml
	core/res/res/values-ru/strings.xml
	core/res/res/values-tr/strings.xml
	core/res/res/values-zh-rCN/strings.xml
	core/res/res/values/config.xml
	data/fonts/Roboto-Bold.ttf
	data/fonts/Roboto-BoldItalic.ttf
	data/fonts/Roboto-Italic.ttf
	data/fonts/Roboto-Regular.ttf
	packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I376757e52555fe45860f404da5fd2293ea45ddce