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

Conflicts:
	cmds/servicemanager/Android.mk
	cmds/servicemanager/service_manager.c
	core/java/android/os/Trace.java
	core/java/com/android/internal/policy/PolicyManager.java
	core/res/AndroidManifest.xml
	core/res/res/values-af/donottranslate-cldr.xml
	core/res/res/values-am/donottranslate-cldr.xml
	core/res/res/values/config.xml
	core/res/res/values/public.xml
	core/res/res/values/strings.xml
	core/res/res/values/symbols.xml
	libs/hwui/OpenGLRenderer.cpp
	packages/SystemUI/res/layout/status_bar.xml
	services/java/com/android/server/wm/WindowManagerService.java
	services/jni/com_android_server_BatteryService.cpp
	telephony/java/android/telephony/SignalStrength.java
	telephony/java/com/android/internal/telephony/RILConstants.java
	wifi/java/android/net/wifi/WifiNative.java
	wifi/java/android/net/wifi/WifiStateMachine.java
hwui: Don't discard framebuffer on exynos4

The layers gets empty/not cleaned and redrawn on top of the preview,
causing beautiful glitch on homescreen, and drawing black instead
of transparency.

Change-Id: I633b104224c73c625f1193ee3dde41823cddc5bf
Telephony: fix typo

Change-Id: Ic13235744fca561cff4d49ae5c799420c30a3840
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
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
card emulation patch port to JB

Patch Set 2: Added missing @hide statements and rebased

Change-Id: I73fe9aa30830951ea5b9d44e9a9bf83cb720e567

Conflicts:
	core/java/android/nfc/Tag.java
	core/java/android/nfc/tech/TagTechnology.java
fixed inconsistant define values with android_nfc.h

Change-Id: Idccd2de60caf7b72839d158b39d14e2cfcdd5fc7
Make contacts app aware of blacklist being disabled (1/3)

Change-Id: Ic59f370a6e78390c9b2b1510e0ec85b2f4af9146

Conflicts:
	core/java/android/provider/Settings.java
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
Bluetooth: SAP: Add framework changes to support SAP

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

Change-Id: I7215f503244c5ee277e83d60d6960f18559acfb9
BT: Fix memory leak when BT on & off done many times

Solves a memory leak in BatteryStatsService when Bluetooth
is turn on/off. Solution adds missing close of proxy then
Bluetooth is turned off.

Change-Id: I65f9db298459c7c15f6a10c752992f1d38469445
CRs-Fixed: 476145
4.3 merge derps

Change-Id: I6af5fdbd20b20d41087bae09956306945e3bf2d1
Merge branch 'jb43' of https://github.com/ParanoidAndroid/android_frameworks_base into jb43-legacy
ActivityTrigger:  New class to invoke when activity starts/resumes

Change-Id: Ib57aa4d3767e27b5bba658b27e084fc3ef042c36

Conflicts:
	core/jni/AndroidRuntime.cpp
	services/java/com/android/server/am/ActivityStack.java
power: Add CPU boosting interface

 * Boosts CPU using Power HAL for the given duration.
 * Duration is given in microseconds.
 * Power HAL must implement POWER_HINT_CPU_BOOST.

Change-Id: Ic79baf7e3d0f75483c2fe8a242b4c3d93368b68b
Add CPU boosting hooks

 * Boost CPU to max during scrolling
 * Boost CPU to max on activity start/resume
 * Inspired by a patch from CodeAuora.

Change-Id: I72f2c2851b01fbceabddead03a4c3a7a0526ca61

Conflicts:
	services/java/com/android/server/am/ActivityStack.java
Merge pull request #71 from Ayysir/CPU-Boost

CPU Boosting for Qcom devices
framework: fix reference leak in activiy manager

Change-Id: If7f27ea35f5a1d1dd7c98fbe5f92729ab9ba0257