am 51563385: (-s ours) am 5d933430: Merge "DO NOT MERGE - Updated Contacts expanders to new style" into gingerbread

Merge commit '51563385d2dba8da256f5fefc4ee3965b5a63553'

* commit '51563385d2dba8da256f5fefc4ee3965b5a63553':
  DO NOT MERGE - Updated Contacts expanders to new style