Hung-ying Tyan fbd21b5875 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...

2010-10-21 10:56:11 -07:00

..

java

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

2010-10-21 10:56:11 -07:00

mockril

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00

tests

resolved conflicts for merge of d4e3bf4d to master

2010-10-12 11:05:54 -07:00