am 31cea05f: Merge change I51d7be27 into eclair-mr2

Merge commit '31cea05f854d0f7b9be07472d85128cc0f44e85a'

* commit '31cea05f854d0f7b9be07472d85128cc0f44e85a':
  Fix a typo.
tree: 5ce0a59140f93890b9c981a5add3b224c2f54735
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. AndroidManifest_test.xml