am 229ef241: Merge "Show a placeholder contact icon if no photo is available." into gingerbread

Merge commit '229ef24138fa8315836aae2358af020990b99c20'

* commit '229ef24138fa8315836aae2358af020990b99c20':
  Show a placeholder contact icon if no photo is available.
tree: 172f00b1b002e99ad8c09bb5483b6e9c49c8982f
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml