Merge branch 'jb43' of github.com:ParanoidAndroid/android_frameworks_base into jellybean-4.3

Conflicts:
	core/jni/android_media_AudioTrack.cpp
	core/res/res/values/public.xml
	core/res/res/values/symbols.xml
	media/java/android/media/AudioRecord.java
	media/java/android/media/AudioService.java
	packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
	packages/SystemUI/res/drawable-hdpi/halo_batch_message.png
	packages/SystemUI/res/drawable-mdpi/halo_batch_message.png
	packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
	telephony/java/com/android/internal/telephony/RILConstants.java
	wifi/java/android/net/wifi/p2p/WifiP2pService.java
wifi: Merge fix #1
Fix recent apps clear all

Change-Id: I776e56f3a982592ba22acbd5c983916c508aa263
HALO fix speech fade out

Change-Id: I3e8cccb2b2884824ab1f3193ecadced4e014211e
merge fixes +2
Add SMS Middleware layer.

Add fix so ordered broadcasts are delivered to system
apps first in the event of a tie. This works around
the issue where terrible apps steal SMS notifications
from the broadcast queue to simply prevent notifications
that could otherwise be removed by a toggle.

Change-Id: I4fff0c584f8fce9c5f2f4fe86a82fe6480c307c7

Conflicts:
	core/res/AndroidManifest.xml
	core/res/res/values/cm_strings.xml
HALO smoother operation

Change-Id: I8c906e969077c826f168a2c452d56d2ce49f78a8
fixed menu button

Change-Id: I8dcac809444e8f25198ede7a314abb101dd421b5
Ported: Bluetooth Message Access Profile (MAP) from CM9

This was added to CM10 to restore message exchange capabilities with automotive systems.

Change-Id: Ib872bebc5c292b1f84c903b068e59b7eeca6d76f
Bluetooth MAP (Message Access Profile) Upstream Changes (3/3)

PORTED FROM CM10: http://review.cyanogenmod.org/#/c/26419/

Incorporates updates to the Bluetooth MAP profile from Code Aurora's
Android Enablement Project since we initially pulled in from their
gingerbread to CM7 last year. This patch addresses bugs with the
current MAP profile, adds a UI request for message access approval
when pairing, and adds additional error checking and logging.
Confirmed to fix date and "Download" function of Ford SYNC Gen1.
Pulled in from the codeaurora jb branch.

Change-Id: I5c7e7396e0e97760bba9bdf4bf848b6bfa58e62c
Fix MAP SDP record generation [2/3].

Give the bluetooth app API to register a server socket for a specific
UUID/port pair. It needs that for registering two OBEX server instances.

Change-Id: I6ede7f2777040af4e653eceb14ea47a2c03abfae
Bluetooth: SAP: Add framework changes to support SAP

This change consists of:
SAP Disconnect from server support related changes

Change-Id: I7215f503244c5ee277e83d60d6960f18559acfb9
Merge branch 'jb43' of github.com:ParanoidAndroid/android_frameworks_base into jellybean-4.3

Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java