OSDN Git Service

am 3d9a3209: am 685fdd50: Merge change I23d84a63 into eclair
authorJeff Sharkey <jsharkey@android.com>
Tue, 6 Oct 2009 22:18:19 +0000 (15:18 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Oct 2009 22:18:19 +0000 (15:18 -0700)
commit21e30960e500b4d2eac5f35eb232e363f0739da4
tree2070c71f4cd22da2f1facbcf68b69783d098de8a
parent25bb7b4eb0351b7fab4eb1469182d7b3d2833b30
parent3d9a3209a940c18efc7b69bbbeaff09745b9adcc
am 3d9a3209: am 685fdd50: Merge change I23d84a63 into eclair

Merge commit '3d9a3209a940c18efc7b69bbbeaff09745b9adcc' into eclair-mr2-plus-aosp

* commit '3d9a3209a940c18efc7b69bbbeaff09745b9adcc':
  Include Google Talk presence, even when missing Im rows.