tree 829231016e099774dfc0532c102a3c179ea40523
parent d33e5beae220cffee704e787fa053017e3245467
parent da6b5eddba5a0dc610f8b41b0f5cc717ac1e55be
author Joe Onorato <joeo@android.com> 1258096923 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258096923 -0800

am da6b5edd: am 67d90e9d: am 06d12abf: Merge change I464c055a into eclair

Merge commit 'da6b5eddba5a0dc610f8b41b0f5cc717ac1e55be'

* commit 'da6b5eddba5a0dc610f8b41b0f5cc717ac1e55be':
  Bug 2244530 - Disable the attempt at not flickering.  It's interfering with the frame rate while rollo animates in.