tree d005228d64de2d9ec0f0c43f335fbbbe29f6e380
parent b980261ee306ba7c82911a3b1d44ba723b66b39d
parent 6e87cc1143ff684611f75a22fd03f7721b10b8fa
author Brian Muramatsu <btmura@android.com> 1297378112 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1297378112 -0800

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

* commit '6e87cc1143ff684611f75a22fd03f7721b10b8fa':
  Salvage Broken ContactsTests