OSDN Git Service

am 1cff7476: Merge change Ie7d26695 into eclair
authorMark Wagner <mxw@google.com>
Tue, 29 Sep 2009 00:14:21 +0000 (17:14 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Sep 2009 00:14:21 +0000 (17:14 -0700)
commitb74e2ac44c72c846095334fab7f60111c1271f34
treef88de8f0422012011d5807d4aa18c7ad873e837c
parentd0fefb802cc0e7968777e326e91647acd2794e75
parent1cff74761798eba8349a3b9824ae4b11072c11d1
am 1cff7476: Merge change Ie7d26695 into eclair

Merge commit '1cff74761798eba8349a3b9824ae4b11072c11d1' into eclair-plus-aosp

* commit '1cff74761798eba8349a3b9824ae4b11072c11d1':
  Modify the "active chats" uri to not overlap with other uris.