| commit | 25fc2758c0b3c2967f10bdd5123a6c5519f8abd7 | [log] [tgz] |
|---|---|---|
| author | Jeff Sharkey <jsharkey@android.com> | Tue Oct 13 12:10:51 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Oct 13 12:10:51 2009 -0700 |
| tree | 67ccbd37e968b9095e8ff5acd0710073a0d8c39f | |
| parent | 1bc0119ce6b08383ad57886011f646f21c7d41d7 [diff] | |
| parent | 0289efad24ec666b9f24cc24ab9cd1d2c459d8d9 [diff] |
am 0289efad: am 37164a25: am 4c82d3b7: Handle external sources that request both social and detail. Merge commit '0289efad24ec666b9f24cc24ab9cd1d2c459d8d9' * commit '0289efad24ec666b9f24cc24ab9cd1d2c459d8d9': Handle external sources that request both social and detail.