Merge refs/heads/jellybean
Remove opaque check in GLRenderer when preparing dirty region. 
add 5 NavBar targets (part 1 of 2)
'Custom Carrier Label (framework part - 2/2)

This change is a rewrite of the ICS custom carrier label.
The change allows the user to customize the carrier
label on the lockscreen and the notification curtain.
The customized text overrides any dynamic mode of the
labels. This change has two enhancements over the ICS
version:
  1. Saving an empty dialog box will revert the label
     to its original, stock appearance.
  2. The notification curtain style is changed to allow
     mixed case labels.

Change-Id: I68da305cfd9ec1a3644dc7c116afe8800465b0e1

Conflicts:

	core/java/android/provider/Settings.java'
framework: add lockscreen text color 1/2 [WIP]

Change-Id: I5d330624e43171b672cea60eebcbf45efa52cc90
Signed-off-by: Jonathan Steadman <xxwhitehawk@gmail.com>

Conflicts:

	policy/src/com/android/internal/policy/impl/LockScreen.java
Services: custom app led colors (1 of 2)

Yeah the title explains it all :)
Services: custom app led colors (1 of 2)

Yeah the title explains it all :)

Change-Id: I4608e68a2c331136d241a5008f874c75ea78a39a
Signed-off-by: Adam Fisch <adammfisch@gmail.com>

Conflicts:

	core/java/android/provider/Settings.java
	services/java/com/android/server/NotificationManagerService.java
frameworks/base: support for qcom application tiling

Support for tiled rendering, can be disabled or enabled with
debug.enabletr property.

Change-Id: Id49301f9dbafc6ef2e44170c95818caee199c03c
hwui: Disable QCOM tile renderer by default

 * Revert once we have new Adreno drivers

Change-Id: Iebf5f1f01a51138c1cd0ff25d1132a6344c9ec35
fix moar qcom pollution

Change-Id: Icd519b32402cef42a46692b5b829cf844411bda8
Fix compile error on QCOM targets
audio: VOIP bringup and support for vocoders

Change-Id: I601d72866baa9846263831664dc6e68cad72625c
telephony: CdmaServiceStateTracker: get cdma subscription when ruim ready.

this code made the assumption that cdma subscription isnt needed when on cdma + lte.
qcom devices need to get both to provision properly because some SIM records are missing.
this patch adds a system property ro.cdma.subscribe_on_ruim_ready to specify that
CDMA subscription should be requested using NV once the SIM records have been read
Code by: J.Steadman
SamsungQualcommUiccRil: hack to prevent SIM unlock popup
Lockscreen: Fix centered layout for unlock ring-
any device
ADB Over Network, integration of the adb-host mode (already present)

The feature can be used/tested without the Settings part :

  setprop service.adb.tcp.port 5555

Note: This ADB setting is not persistent (for security purpose) and
require init.rc implementation event like this : http://bit.ly/AdbTcpIP

Change-Id: I5c61a53948349c785356cb5aae165110d75e3074
Signed-off-by: Tanguy Pruvot <tanguy.pruvot@gmail.com>

Conflicts:

	core/java/android/provider/Settings.java
Option to hide Adb notification icon (framework-part)
from Jonathan Steadman
Make "SD Card removed" notification dismissible if the removed SD Card is not the primary storage

The Galaxy S uses the "external SD Card" as the extended storage
and it the notification should be dismissible as it's okay not
to have it.
Additionally, this patch also not hide the USB storage mount dialog
if the removed storage is not the primary storage
Change-Id: I524b294c57ba80f19cf1af808af65ce1308f5a0b
Services: Adding HSPAP info in Android

HSPA+ management is missing in GPS Loc service.
Change-Id: If828c1b078d5989f501c3eb917a573a6db773453
Multi commit: sim pin and tether
Change SIM Pin lock entry to center of window with transparent background
for devices with large screens (Tablets)

Fix interface name for tethering
Fix the interface name used in stopTethering