merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

Change-Id: I088f7356b684381f971b7e9f6773ba24f7f9b62a
hwc: Hide layer1 if the FB_TAGET layer is not needed

Leave layer1 enabled but hide it when not needed because if both layers
get disabled, the hdmi mixer and phy will get powered off.

Bug: 7363167
Change-Id: I4a969be7fb7877b05e866488d71f478c8f1c0fb4
omx: basecomponent: signal abendStateEvent if componentInit fails

Bug: 7261738
Change-Id: I1baf82b37120207de9f757a66e76185e68a81b80
Signed-off-by: Dima Zavin <dima@android.com>
exynos_omx: multi_thread: Add OMX_IndexConfigVideoIntraVOPRefresh support.

Add config dynamic change of "encode component".

Bug: 7546690

Change-Id: I82b043d51aa8295929201ce26c2b1afd5bcdb0e8
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Merge "omx: basecomponent: signal abendStateEvent if componentInit fails" into jb-mr1.1-dev
Merge "hwc: Hide layer1 if the FB_TAGET layer is not needed" into jb-mr1.1-dev
exynos_omx: multi_thread: Add OMX_IndexParamVideoIntraRefresh support.

Add OMX_IndexParamVideoIntraRefresh support, with "Cyclic intra marcoblock refresh" mode support only.
Don't support "Adaptive intra-refresh".

o related-to-bug: 7524845

Change-Id: Id47c0cd3831db6fdb4e46ccece8f8d6f955d777a
Signed-off-by: SeungBeom Kim <sbcrux.kim@samsung.com>
Merge tag 'android-4.2.2_r1.2' of https://android.googlesource.com/platform/hardware/samsung_slsi/exynos5 into cm-10.1

Android 4.2.2 release 1.2

# gpg: Signature made Wed 17 Apr 2013 01:00:33 PM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Merge remote-tracking branch 'cm/cm-10.1' into HEAD