am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low...
am 6d4346ce: am 4cffbb47: Merge "fix [2946787] Screen flicker on low resolution setting in camcorder." into gingerbread
Merge commit '6d4346ce'
* commit '6d4346ce':
fix [2946787] Screen flicker on low resolution setting in camcorder.