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.
tree: 829231016e099774dfc0532c102a3c179ea40523
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE