tree 098417931546946efcd3ae0cd964b2d743dc5d89
parent d19b510c3933d27f87e25c603bf55817ac1c2c6d
parent f38409d27e7e057261235c2d2c4283160059f5b8
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...