tree b31a7d615f3cb63436d6b341d3aef7531da68eda
parent 821f087989a75ce9e04dc8dcc99b227fde0a0e28
parent d691b36cdea314585b6aa17556ed4c35bb65a69e
author Hung-ying Tyan <tyanh@google.com> 1287683771 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1287683771 -0700

am d691b36c: am 6fe795ec: Do another contact lookup if the first one fails and...

Merge commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e'

* commit 'd691b36cdea314585b6aa17556ed4c35bb65a69e':
  Do another contact lookup if the first one fails and...