am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that...
am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit '140d040b' into kraken
* commit '140d040b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again