Merge remote-tracking branch 'AOSP/jb-mr1.1-release' into jb-ras-mr1

Conflicts:
	AndroidManifest.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-ru/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/ChooseLockPatternTutorial.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/Settings.java
	tests/res/layout/bluetooth_request_permission_test.xml
	tests/src/com/android/settings/tests/BluetoothRequestPermissionTest.java
Merge github.com:CarbonDev/android_packages_apps_Settings into jb2