modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
fix quick settings
	modified:   core/res/res/values/config.xml
	modified:   core/res/res/values/symbols.xml
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsController.java
	modified:   core/res/res/values/symbols.xml
Revert "Keyboard Lights !"

This reverts commit 93e4c8c64b576085162250c02d90823e35bab7c0.

	modified:   services/java/com/android/server/power/DisplayPowerController.java
	modified:   services/java/com/android/server/power/PowerManagerService.java
Revert "	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java"

This reverts commit 429b2cc5d04b57343d34ad6f28ab45d57d13f76b.

	modified:   packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
Merge git://github.com/LiquidSmooth/android_frameworks_base into liquid-jb
hone/PhoneStatusBar.java"

This reverts commit 429b2cc5d04b57343d34ad6f28ab45d57d13f76b.

Conflicts:
	core/res/res/values/config.xml

	modified:   core/java/android/os/BatteryManager.java
	deleted:    core/res/res/values/config.xml~
	modified:   core/res/res/values/strings.xml
	modified:   core/res/res/values/symbols.xml
	modified:   packages/SystemUI/res/values/config.xml
	modified:   services/java/com/android/server/BatteryService.java
	modified:   services/jni/Android.mk
	modified:   services/jni/com_android_server_BatteryService.cpp
	modified:   core/res/res/values/symbols.xml
Add support for external dock batteries

Allows the external battery status to be read via framework.

Change-Id: I1340071cecab8f1733e58e4f3ba0d304f861f311
Squashed commit of GPS changes from CodeAurora

GpsLocationProvider: ipv6 support

AGPS calls to accept ipv6 addresses

Change-Id: If9187b8fd9e0ba22cd01722d5c04aabccebad38b

GPS Provider changes

Added support to delete aiding data test feature.
Added more data catagories, to now at the total of 21

Change-Id: Icb15d21b8204323021c47eac5249cde128e38246

GPS provider - AGPS Dual APN support

To support either SUPL or any WWAN connection - allow connction
type at open request API; FW's support to dual AGPS connections

Change-Id: Iecb07f31a99353f75c1a0c000bb6e39ef007f6bf

Supporting IPv4v6 and IPv6 bearer types for ATL

Change-Id: Ife8c72d9975ac58b9e4091cb95ad5a9763e01c3f

gps: determine ip protocol type from telephony.db

Instead of determining the ip protocol type from the
type of ip address we have, the ip protocol type is
looked up in telephony.db based on the carrier and apn.

Change-Id: Ib0d76354515fb44f570668d5a4a42cccfa6fe78a
CRs-Fixed: 376537

gps: get apn when supl is already active

When supl is already active, get the apn and bearer and
try to connect, instead of reporting failure.
CRs-fixed: 401408

Change-Id: I2eed11e0a34a55d1b62d37f0a6c97b1f3f2fecae

gps: allow xta data over default mobile connection

If the default mobile data connection is up and
connected, use that connection to download xta data.

Change-Id: Ic5ff5422ac9baf83ac923faeb1f8b4fc9186c184
CRs-fixed: 399721

GpsLocationProvider: Support type wifi in i/F request.

Add support in GpsLocationProvider for wifi type for
i/F request.

Change-Id: I44463e72857c06ae24626b8f3cd482ddac7c278b

Conflicts:

	services/java/com/android/server/location/GpsLocationProvider.java

gps: adding net_raw gid for IPC permission

for AFW to have permission to call loc api

Change-Id: Ifc7451659431fa1c1998f5d75bfa5f2018a5d054

gps: fixed singleshot session that doesn't stop

When a single shot location is requested and a
location is returned, the location request is
not stopped and so it continues even when the
requestor has stopped listening. This can cause
gps tracking to continue in the backgroud and eat
up battery.

This is fixed by stoping the provider if there
are no more update record associated with it
when a location is returned.

Change-Id: Ie437732ff06231a46724843af30e21ca3a1694ab

gps: return dummy apn instead of null

This change was missed during merge, which
can cause exception(crash) if apn is returned
as null.

Change-Id: I15160c8f2f512cc75bbe1b7b7ef4695c201112d8
RilConstants: add missing RIL processes (2/2)

Also needed: http://review.cyanogenmod.org/#/c/29653/

Change-Id: I63f1d5eba5e71af3aaae372ae9d791f1bef9ad77
Revert "[webkit] Postpone sending scroll message to webcore thread"

This reverts commit f91d0f41ff927279191ca43e0a4a30c248cf0dd5.
Revert "[webkit]Change the thread priority"

This reverts commit 136cd17747def0c48e4745bc3aea8478540f85f6.
Revert "[webkit] Runtime enablement of WebGL"

This reverts commit bc8520da8f24e7d95fc084d605673812c6a5757b.
Revert "Squashed commit of GPS changes from CodeAurora"

This reverts commit b9879160ec8970dacfb4da1801e7b9fb412a26d4.
[2/3] mediaeditor: Allow custom DOMX source instead of Google DOMX default

Part 2 of 3 patches: To allow omap4 devices to use custom "domx" source
via a new BoardConfig.mk item:
TI_CUSTOM_DOMX_PATH := device/<manufacturer>/<device-name>/domx

This setting provides for 3 changes during the build:
1. In hardware/ti/omap4xxx this settings stops standard Google domx
source from being built and changes the domx reference for tiutils.
2. In frameworks/base it changes the default openmax references for
frameworks/base/media/jni/mediaeditor/Android.mk to the new location
3. In frameworks/av changes the openmax references in 5 places, and adds
new includes in ACodec.cpp, CameraSource.cpp and OMXCodec.cpp

This commit is based on cherry-pick from omapzoom (with a more descriptive
BoardConfig setting name):
http://www.omapzoom.org/?p=platform/frameworks/base.git;a=commit;h=f7f929ff477955333bf7e7413a81a66d683d1f3f

Change-Id: I76e558ce840ea45eec14194f2e9107fb83cebf8f
Signed-off-by: Hashcode <hashcode0f@gmail.com>

Conflicts:

	media/jni/mediaeditor/Android.mk
TelephonyProperties: Alpha ID fix for OPEN_CHANNEL and other p-commands (1/2)

p-cmds that support the below mentioned scenarios:
- SETUP CALL
- OPEN CHANNEL
- SEND DTMF
- SEND SMS
- SEND SS
- SEND USSD
- LAUNCH BROWSER
- PLAY TONE
- SELECT ITEM

Senarios handled :
- NO ALPHA ID : Introduce a new configurable sys prop
  "persist.atel.noalpha.usrcnf".
   --  Allow display of default UI confirmation if prop is set to true
   --  No UI confirmation to be show if prop is set to false
- NULL ALPHA ID (len = 0 ) :
   -- NO UI confirmation to be displayed

Cherry-picked from CAF commit 5ea0d64186ca08abc0857aae1f83de969393be3b
Without this SimToolkit will pop up asking for user response instead
of recieveing response from framework.

Change-Id: I012707285ee3a93119c2e2956ec599d631db10d5
Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>

Conflicts:

	telephony/java/com/android/internal/telephony/TelephonyProperties.java
Mms auto-retrieval (1/3): framework

Change-Id: I9b2f76d8cf9d67eddddfdf7737a948eea680329f

It's only porting this http://review.cyanogenmod.org/#/c/26166/
Part 1 of 3
Merge git://github.com/LiquidSmooth/android_frameworks_base into liquid-jb

Conflicts:
	core/res/res/values/config.xml
	services/java/com/android/server/NetworkManagementService.java

	modified:   cmds/installd/commands.c
	modified:   cmds/installd/installd.c
	modified:   cmds/installd/installd.h
	modified:   cmds/installd/utils.c
	modified:   core/java/android/bluetooth/BluetoothDevice.java
	modified:   core/java/android/preference/PreferenceActivity.java
	modified:   core/java/android/widget/TabWidget.java
	modified:   core/jni/android/graphics/BitmapFactory.cpp
	modified:   core/res/res/values-ar-rEG/donottranslate-cldr.xml
	modified:   core/res/res/values-ar/donottranslate-cldr.xml
	modified:   core/res/res/values-bg/donottranslate-cldr.xml
	modified:   core/res/res/values-ca/donottranslate-cldr.xml
	modified:   core/res/res/values-cs/donottranslate-cldr.xml
	modified:   core/res/res/values-da/donottranslate-cldr.xml
	modified:   core/res/res/values-de/donottranslate-cldr.xml
	modified:   core/res/res/values-el/donottranslate-cldr.xml
	modified:   core/res/res/values-en-rAU/donottranslate-cldr.xml
	modified:   core/res/res/values-en-rGB/donottranslate-cldr.xml
	modified:   core/res/res/values-en-rIE/donottranslate-cldr.xml
	modified:   core/res/res/values-en-rIN/donottranslate-cldr.xml
	modified:   core/res/res/values-en-rNZ/donottranslate-cldr.xml
	modified:   core/res/res/values-en-rZA/donottranslate-cldr.xml
	modified:   core/res/res/values-es-rUS/donottranslate-cldr.xml
	modified:   core/res/res/values-es/donottranslate-cldr.xml
	modified:   core/res/res/values-fa/donottranslate-cldr.xml
	modified:   core/res/res/values-fi-rFI/donottranslate-cldr.xml
	modified:   core/res/res/values-fi/donottranslate-cldr.xml
	modified:   core/res/res/values-fr/donottranslate-cldr.xml
	modified:   core/res/res/values-hi-rIN/donottranslate-cldr.xml
	modified:   core/res/res/values-hr-rHR/donottranslate-cldr.xml
	modified:   core/res/res/values-hr/donottranslate-cldr.xml
	modified:   core/res/res/values-hu-rHU/donottranslate-cldr.xml
	modified:   core/res/res/values-hu/donottranslate-cldr.xml
	modified:   core/res/res/values-in-rID/donottranslate-cldr.xml
	modified:   core/res/res/values-in/donottranslate-cldr.xml
	modified:   core/res/res/values-it/donottranslate-cldr.xml
	modified:   core/res/res/values-iw/donottranslate-cldr.xml
	modified:   core/res/res/values-ja/donottranslate-cldr.xml
	modified:   core/res/res/values-ko/donottranslate-cldr.xml
	modified:   core/res/res/values-lt-rLT/donottranslate-cldr.xml
	modified:   core/res/res/values-lt/donottranslate-cldr.xml
	modified:   core/res/res/values-lv-rLV/donottranslate-cldr.xml
	modified:   core/res/res/values-lv/donottranslate-cldr.xml
	modified:   core/res/res/values-nb/donottranslate-cldr.xml
	modified:   core/res/res/values-nl/donottranslate-cldr.xml
	modified:   core/res/res/values-pl/donottranslate-cldr.xml
	modified:   core/res/res/values-pt-rPT/donottranslate-cldr.xml
	modified:   core/res/res/values-pt/donottranslate-cldr.xml
	modified:   core/res/res/values-ro-rRO/donottranslate-cldr.xml
	modified:   core/res/res/values-ro/donottranslate-cldr.xml
	modified:   core/res/res/values-ru/donottranslate-cldr.xml
	modified:   core/res/res/values-sk-rSK/donottranslate-cldr.xml
	modified:   core/res/res/values-sk/donottranslate-cldr.xml
	modified:   core/res/res/values-sl-rSI/donottranslate-cldr.xml
	modified:   core/res/res/values-sl/donottranslate-cldr.xml
	modified:   core/res/res/values-sr-rRS/donottranslate-cldr.xml
	modified:   core/res/res/values-sr/donottranslate-cldr.xml
	modified:   core/res/res/values-sv/donottranslate-cldr.xml
	modified:   core/res/res/values-th-rTH/donottranslate-cldr.xml
	modified:   core/res/res/values-th/donottranslate-cldr.xml
	modified:   core/res/res/values-tl/donottranslate-cldr.xml
	modified:   core/res/res/values-tr/donottranslate-cldr.xml
	modified:   core/res/res/values-uk-rUA/donottranslate-cldr.xml
	modified:   core/res/res/values-uk/donottranslate-cldr.xml
	modified:   core/res/res/values-vi-rVN/donottranslate-cldr.xml
	modified:   core/res/res/values-vi/donottranslate-cldr.xml
	modified:   core/res/res/values-zh-rCN/donottranslate-cldr.xml
	modified:   core/res/res/values-zh-rTW/donottranslate-cldr.xml
	modified:   core/res/res/values/config.xml
	modified:   core/res/res/values/donottranslate-cldr.xml
	modified:   core/res/res/values/symbols.xml
	modified:   media/java/android/media/AudioService.java
	new file:   packages/SystemUI/res/drawable-hdpi/ic_recents_clear_normal.png
	new file:   packages/SystemUI/res/drawable-hdpi/ic_recents_clear_pressed.png
	new file:   packages/SystemUI/res/drawable-mdpi/ic_recents_clear_normal.png
	new file:   packages/SystemUI/res/drawable-mdpi/ic_recents_clear_pressed.png
	new file:   packages/SystemUI/res/drawable-xhdpi/ic_recents_clear_normal.png
	new file:   packages/SystemUI/res/drawable-xhdpi/ic_recents_clear_pressed.png
	new file:   packages/SystemUI/res/drawable/ic_recents_clear.xml
	modified:   packages/SystemUI/res/layout-sw600dp/navigation_bar.xml
	modified:   packages/SystemUI/res/layout/status_bar_expanded_header.xml
	modified:   packages/SystemUI/res/layout/system_bar_recent_panel.xml
	modified:   packages/SystemUI/res/values/donottranslate.xml
	modified:   packages/SystemUI/res/values/strings.xml
	modified:   packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java
	modified:   packages/SystemUI/src/com/android/systemui/quicksettings/GPSTile.java
	modified:   packages/SystemUI/src/com/android/systemui/quicksettings/TorchTile.java
	modified:   packages/SystemUI/src/com/android/systemui/quicksettings/WifiAPTile.java
	modified:   packages/SystemUI/src/com/android/systemui/statusbar/policy/DateView.java
	modified:   services/java/com/android/server/DeviceStorageMonitorService.java
	modified:   telephony/java/com/android/internal/telephony/RILConstants.java
	deleted:    0001-custom-domx-skip-ENHANCED_DOMX-check-and-use-DOMX_PA.patch
	modified:   core/java/android/webkit/WebViewCore.java