tree b269991f25e065eb37bb672cdd7155960e548ec8
parent 162a915a3a287b9eeb5289aabb15a31bf43e92f1
parent 24a617736ec9e65960de1fbf7d96c4b8dfb40178
author Brian Muramatsu <btmura@android.com> 1297379044 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297379044 -0800

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

* commit '24a617736ec9e65960de1fbf7d96c4b8dfb40178':
  Salvage Broken ContactsTests