am 37164a25: am 4c82d3b7: Handle external sources that request both social and detail.

Merge commit '37164a25e91e8f233237043975dd86c639863a6e' into eclair-mr2-plus-aosp

* commit '37164a25e91e8f233237043975dd86c639863a6e':
  Handle external sources that request both social and detail.