tree 9e11a5b07fed34b974124880b94f4fe0fc38eb05
parent 1e70e8fd9d395de9520251a14cdf0f8d8582031e
parent 67d90e9d46aa9f26472861e48c69c8e8a28ece21
author Joe Onorato <joeo@android.com> 1258096692 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258096692 -0800

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

Merge commit '67d90e9d46aa9f26472861e48c69c8e8a28ece21' into eclair-mr2-plus-aosp

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