am f46af058: Merge "Some minor pixel adjustments and consolidating some common values to a style." into gingerbread

Merge commit 'f46af058960639eb2f87040d733060469db12b21'

* commit 'f46af058960639eb2f87040d733060469db12b21':
  Some minor pixel adjustments and consolidating some common
tree: 89df1127cc51cdb306fc5188540bbb9b6cc2b587
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml