port Moto battery charge fix from ICS

Change-Id: Iaed07e682463a6467b1903ab40cf41440334b64b
port DHackers telephony settings from 4.1

Change-Id: Ic29403056cf7d55301c169be5dc77a687b6a1b79
battery-mod: missed paren

Change-Id: Id458d416fc877fe8447b92a18f52a274c1e6da55
merge: Finish DHackers data settings

Change-Id: Ifcb322135f74d8974050d83866cab1baf55c8ce0
Merge branch 'mr1-staging' of git://github.com/CyanogenMod/android_frameworks_base into mr1-staging
MediaEditor: Use enhanced DOMX

MediaEditor includes StageFright headers, so it need to use enhanced
DOMX in Android.mk explicitly.

Change-Id: Id04e847e3b8a8424b13e8b47f67373f74f2024ff
Signed-off-by: Daniel Levin <dendy@ti.com>
Add OMAP_ENHANCEMENT definition to SystemProperties

Adding OMAP_ENHANCEMENT defenition.

Change-Id: Idaad47fabbd9cd2140714a2a9d682e8a3f49b446
Signed-off-by: Vishal Mahaveer <a0271468@ti.com>
p2p: reset interface when stopping dhcp server

When switching roles from GO to station the p2p interface retains old
IP address of GO.
Fix it by resetting the interface when stopping dhcp server.

Change-Id: I7c1bd1056302b37c5a603452d7be2b252de3e91c
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
Video Encoder : Support Setting of H264 Encoder profile through system property

This patch supports setting of Different Encoder Profiles for H264 Encoder.
This can be done by setting the property: video.h264enc.profile to
1 - BASE PROFILE , 2 - MAIN PROFILE and 8 - HIGH PROFILE
Invalid setting will result to using BASE PROFILE as default.

Ported from ICS

Change-Id: I2352ff715adba495f6e1365da8de326bbc6ef2c1
Signed-off-by: Sathya Prakash M R <a0393677@ti.com>
Signed-off-by: Andriy Chepurnyy <x0155536@ti.com>
GNSS: Start SUPL service.

Start SUPL service by adding an entry in SystemServer.java.
This patch also adds dummy SUPL server files since complete
source cannot be added due to liscensing restrictions. Dummy
SUPL server code will be over written when GPS is included in
builds. If GPS is not included in the build, then dummy SUPL
server will not cause any issue.

Change-Id: I10f1d2a1302d3e01f9bb597d6b5b1855ee045754
Signed-off-by: Satish Chandra <x0141690@ti.com>
Signed-off-by: Bindu <bkurian@ti.com>
Revert "merge: Finish DHackers data settings"

This reverts commit 87159e0211da336cbefeb5135a9c1c670f78d553.
Revert "port DHackers telephony settings from 4.1"

This reverts commit 4787f2e1ca1b77e4f217c863ed5e36af7d109082.
Framework: Fix GSM signal strength

Certain OEM gsm ril libs send back a bogus value for LTE signal
that causes SignalStrength.java to default to LTE and report
incorrect signal values.
Use prop value ro.telephony.ril.v3=signalstrength to get proper
GSM signal reading on certain devices.

Change-Id: Ibb23d7b3a2d21001ccbbc6ebfbdc3c5248f18cfc
Signed-off-by: dhacker29 <davidhackerdvm@gmail.com>
Merge branch 'mr1-staging' of git://github.com/CyanogenMod/android_frameworks_base into mr1-staging
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.1