tree b2b553154fdb97d5be1cdb403e7afde16c4409d9
parent 4cbc4f1067503b5de62a5338478d3cad8c25bd3d
parent 6d4346ce35a521d67f45d7c9658c450c0fc461d2
author Mathias Agopian <mathias@google.com> 1282779628 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282779628 -0700

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

Merge commit '6d4346ce35a521d67f45d7c9658c450c0fc461d2'

* commit '6d4346ce35a521d67f45d7c9658c450c0fc461d2':
  fix [2946787] Screen flicker on low resolution setting in camcorder.