Merge change 24318 into eclair

* changes:
  Avoid CDMA messages with IDs of zero.
diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java
index 31d43ee..c734aed 100644
--- a/core/java/android/provider/ContactsContract.java
+++ b/core/java/android/provider/ContactsContract.java
@@ -523,7 +523,7 @@
         /**
          * Aggregation mode: aggregate at the time the raw contact is inserted/updated.
          */
-        public static final int AGGREGATION_MODE_IMMEDITATE = 1;
+        public static final int AGGREGATION_MODE_IMMEDIATE = 1;
 
         /**
          * If {@link #AGGREGATION_MODE} is {@link #AGGREGATION_MODE_SUSPENDED}, changes