am 8c263d38: Merge "Polish." into gingerbread

* commit '8c263d38c29801ca40b26e44e250483b7678095f':
  Polish.
tree: 54ca172fb4e86abd4441ef72d4989d80225144c9
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml