Merge tag 'android-4.3_r3' into hardwarekeys

Android 4.3 release 3.0

Signed-off-by: scott <scott@ubuntu.com>

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

Change-Id: I552e3a07ce69cc0d848fcf6120a39b36731c2610

Conflicts:
	res/values-iw/strings.xml
Partition information menu

Author:    nobodyAtall <tsogkas@ceid.upatras.gr>

PS5: moved some things around
PS6: derp fixes and cleanup
PS7: whitespece massacre
PS8: fix0red
PS9: make it look good
PS10: fixed my previous derpz0rz

Change-Id: Ie5493bd9ba8e8e9bd251b417dcdfee0f3bd35e45
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	AndroidManifest.xml
	res/values/strings.xml
	res/xml/device_info_memory.xml
Add external bluetooth GPS support (2/2)

Originally by
Cuong Bui <cuongbui@gmail.com>
Benjamin Bunse <ich@morphew.de>

http://review.cyanogenmod.org/#/c/20849/
http://review.cyanogenmod.org/#/c/20850/

http://review.cyanogenmod.org/#/c/36809/
http://review.cyanogenmod.org/#/c/36810/
http://review.cyanogenmod.org/#/c/36811/

Change-Id: Ia88ad9c70f89a09d308d2cccf9860c4d35470b24
Signed-off-by: scott <scott@ubuntu.com>

Conflicts:
	res/values/strings.xml
	res/xml/location_settings.xml