tree bfbc167b96d2ae7ba6f944365653887d012fbb57
parent 49209cbcef37c4b20c9d0649ba284a51144b3930
parent 4cffbb47a28faa594c2217d1e84f9382e0b57cc4
author Mathias Agopian <mathias@google.com> 1282776044 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282776044 -0700

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

Merge commit '4cffbb47a28faa594c2217d1e84f9382e0b57cc4' into gingerbread-plus-aosp

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