Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/packages/apps/Settings into jellybean

Android 4.3 release 2.1

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

Change-Id: I41fb2b4601deaf53dd20c45f3319d8be8b164579
4.3 fixes

Change-Id: Ia06210772d21e2d72e297194481184e4d1e8ae27
Merge remote-tracking branch 'pa/jb43' into jellybean

Signed-off-by: Evan Anderson <evan1124@gmail.com>

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

Change-Id: I6c517aead779a2640c9a7e46206793b4c6d15058