Merge "Show a placeholder contact icon if no photo is available." into gingerbread
Ben Komalo [Mon, 25 Oct 2010 17:41:40 +0000 (10:41 -0700)]

Trivial merge