Merge change 23495 into eclair

* changes:
  Workaround bug in Poloroid Pogo.
tree: 0f454c004b891a0390cb03cff1c02aeea0ec25f4
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml