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.

core/java/android/provider/Im.java

@@ -540,7 +540,7 @@ public class Im {
          * The content:// style URL for contacts who have an open chat session
          */
         public static final Uri CONTENT_URI_CHAT_CONTACTS =
-            Uri.parse("content://com.google.android.providers.talk/contacts/chatting");
+            Uri.parse("content://com.google.android.providers.talk/contacts_chatting");
 
         /**
          * The content:// style URL for contacts who have been blocked