am 24a61773: am 6e87cc11: am a2ab5875: am 9f0a386e: Merge "Salvage Broken ContactsTests" into gingerbread

* commit '24a617736ec9e65960de1fbf7d96c4b8dfb40178':
  Salvage Broken ContactsTests