Merge remote-tracking branch 'upstream/cm-10.1' into cm-10.1

Conflicts:
	packages/SystemUI/res/values/strings.xml

Change-Id: I8da1b468be5261863cd79da0db32bc7633468573
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_frameworks_base into HEAD
Temporary patch for HBO - Disable prevent power key check

Change-Id: I3877d7493bcdb3c4be61e3ac2bc6dcb67b8ef7a9

Conflicts:

	core/java/android/view/Window.java
Tablet statusbar: Removed Airplane mode and Wi-Fi, moved Notifications toggle up
[3/3] mediaeditor: use custom DOMX_PATH when defined

3rd of 3 patches to allow omap4 devices to build custom domx libs
and reference them in frameworks/base via 2 new BoardConfig defines:
ENHANCED_DOMX := true
DOMX_PATH := device/<vendor>/<device>/domx

This is a cherry-pick from omapzoom:
http://www.omapzoom.org/?p=platform/frameworks/base.git;a=commit;h=f7f929ff477955333bf7e7413a81a66d683d1f3f

Change-Id: Iee59015a9f874ba6ce16ff84f175de6d3d970ac7
Signed-off-by: Hashcode <hashcode0f@gmail.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>
custom domx: skip ENHANCED_DOMX check and use DOMX_PATH instead

Change-Id: I242bcfb0fdff2a917353b3086dec962adad88a83
[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: If0f27f1547353536e3635e5f9312876375c6f344