Merge tag 'android-4.3_r2.2' into jb3

Android 4.3 release 2.2

Conflicts:
	res/values/strings.xml

Conflicts:
	res/values-nl/strings.xml
	res/values-sw/strings.xml
	res/values/strings.xml
Merge tag 'android-4.3_r3' into jb3

Android 4.3 release 3.0

Conflicts:
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java

Conflicts:
	src/com/android/settings/WirelessSettings.java
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/apps/Settings into jb3

Android 4.3 Release 3.1

Conflicts:
	src/com/android/settings/WirelessSettings.java