Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_services_telephony into kitkat
Spanish translation for national roaming

Change-Id: I9c166bd0449654b1a61db3d25f716c9c1058f9a2
Italian translations for national roaming.

Signed-off-by: Carlo Savignano <stevewatersy@gmail.com>
Revert "[3/3]Quiet Hours"

This reverts commit 032ea5d7171b6d5c8469c47e8d4af89ae273fe38.

Change-Id: I834d1aa509df1e45293aa0f6a748c3b018f475f4
Merge "Revert "[3/3]Quiet Hours"" into kitkat
Merge branch 'kitkat' of https://github.com/AOSPA/android_packages_services_telephony into kitkat
BT: Multi HF support for BluetoothManager in Telephony.

This patch adds multi hf support in Telephony.
Returns AudioOn state and Connection state for
specific HS.

Change-Id: I1d19111bbf9728675800e356e8bd7652006e2e59
Merge remote-tracking branch 'PA/kitkat' into remix-legacy

Conflicts:
	res/values/pa_strings.xml
	src/com/android/phone/Ringer.java