Merge change 23667 into eclair

* changes:
  Fix the -1 unread count bug.

core/java/android/provider/Gmail.java

@@ -1551,7 +1551,7 @@ public final class Gmail {
             if (unreadConversations == null) {
                 return 0;
             } else {
-                return unreadConversations;
+                return unreadConversations < 0 ? 0 : unreadConversations;
             }
         }