Merge remote branch 'cm/cm-10.1'
Merge remote branch 'cm/cm-10.1'
Merge remote branch 'cm/cm-10.1'
Merge remote branch 'cm/cm-10.1'
This is a combination of 4 commits.

Bluetooth: Add JB tip Bluetooth code to build with bluez based solution

Add JB tip Bluetooth Settings code to build with bluez based solution and
existing Bluetooth Settings code to support bluedroid based solution.
Android.mk file contains the change to toggle between the solution
as needed.

Change-Id: I06244e05419b799bc232e52712a5a171b7f57ee9

Conflicts:

	res/layout/bluetooth_mas_access.xml
	res/values/strings.xml

Bluetooth: Introduce BluetoothProgressCategory class

Replace ProgressCategory class with BluetoothProgressCategory class
for making use of common settings resources

Change-Id: Icabddba794336232af4211ca32319f37b4a45167

Bluetooth: Proper update of the profile list on SDP updates

Updates the profile cache with new UUIDs arrived as part of
SDP results without clearing the existing profiles. This
fixes the IOT issue of few carkits with improper intermediate
UUID updates

Change-Id: I37b2eaf8e873b2798b3b838d15383811b4093c38
CRs-fixed: 450068

Bluetooth: Proper Enable/Disable of Pairing dialogue's OK button

Disable the OK button when there is no suffecient char/keys
entereted on the Pairng dailog's text bx. This would block the
user from trying to pair without having the right PIN key length

CRs-fixed: 455063

Change-Id: Ia9c0d1bfb1f202dadaa82ad9e4de059b90aea044
Merge commit 'android-4.2.2_r1' into Upgrade_branch

* commit 'android-4.2.2_r1': (46 commits)
  Distinguish adding an already present word / cancelling
  Call back to whom requested to add a word to the user dict
  Fix wifi compareTo
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Pass the locale code in the help url for help pages.
  Add latest area info broadcast to Settings status screen.
  Import translations. DO NOT MERGE
  Revised language for notification ringtone picker.
  Import translations. DO NOT MERGE
  Better layouts for security screen setups as part of b/7459863
  Push scrollbars to screen edges.
  Fix text alignment and simplify layouts.
  Disable USB debugging checkbox and backup password for secondary users
  Fix incorrectly inverted text color.
  Add string resource removed by previous commit.
  Use uniform font size for APNs and timezones. DO NOT MERGE.
  Avoid split action bar when it only has one item.  DO NOT MERGE.
  Import translations. DO NOT MERGE
  ...

Conflicts:
	AndroidManifest.xml

Change-Id: Ie5f97b83c85b0633345fdf472cad0a1390101df1

Conflicts:

	AndroidManifest.xml
	res/layout/account_sync_screen.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-es/strings.xml
	res/values-fi/strings.xml
	res/values-hu/strings-extras.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ru/strings.xml
	res/values-uk/strings.xml
	res/values-zh-rCN/strings.xml
	res/values/strings.xml
	src/com/android/settings/ChooseLockGeneric.java
	src/com/android/settings/DeviceInfoSettings.java
	src/com/android/settings/Settings.java
Merge branch 'cm-10.1' of https://github.com/androidarmv6/android_packages_apps_Settings into cm-10.1