Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml

Change-Id: If5a5d4ac8861d172582807b4c4146e9014f4d9ab
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Settings: use CMHW serial number

See http://review.cyanogenmod.org/57164

Change-Id: If328ca7b487435b88246d1f8c47b04770183f09e
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge "Settings: use CMHW serial number" into cm-11.0
Bluetooth: GAP: Avoid adding device to cached device list

Change will ensure that devices will not be added to the cached
device list if profile connection state is STATE_DISCONNECTED
or STATE_DISCONNECTING. Otherwise, devices will be added to cached
list and while inquring device will not be listed in available
device list.

CRs-Fixed: 586975
Change-Id: I60bc01c0f2cb5ea87f3c633bcec2f04c90939d67
Bluetooth: HID: Use proper values of connection status

This patch fixes issue in retrieving correct connection status when
more than one hid device was connected to DUT. In such situation
current implementation was sending STATE_DISCONNECTED as connection
state because of wrong check of matching device as 1st device in
connected device list. Instead of this now actual connection state
device is retrieved from HidService.

Change-Id: I2c766e9fc6eb9e97c3745016e38fa5c374c16539
CRs-Fixed: 593065
Merge remote-tracking branch 'github/cm-11.0' into cm-11.0
Merge branch 'sgt7' into cm-11.0-sc

Conflicts:
	res/values/cm_arrays.xml
	res/values/cm_strings.xml