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
[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