Merge change If143a45c into eclair

* changes:
  Newer icons
diff --git a/src/com/android/contacts/model/GoogleSource.java b/src/com/android/contacts/model/GoogleSource.java
index b6f1e29..6706ec0 100644
--- a/src/com/android/contacts/model/GoogleSource.java
+++ b/src/com/android/contacts/model/GoogleSource.java
@@ -41,7 +41,7 @@
 import java.util.ArrayList;
 
 public class GoogleSource extends FallbackSource {
-    public static final String ACCOUNT_TYPE = "com.google.GAIA";
+    public static final String ACCOUNT_TYPE = "com.google";
     public GoogleSource(String resPackageName) {
         this.accountType = ACCOUNT_TYPE;
         this.resPackageName = null;