tree 9e11a5b07fed34b974124880b94f4fe0fc38eb05
parent d241fad4c6320789f2eaf9fc7d79d0635af8440d
parent 06d12abf6368e7b2277e70332e945d6fcf5ee1c8
author Joe Onorato <joeo@android.com> 1258096159 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258096159 -0800

am 06d12abf: Merge change I464c055a into eclair

Merge commit '06d12abf6368e7b2277e70332e945d6fcf5ee1c8' into eclair-mr2

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