am ba8e4d24: Merge change Ib5343691 into eclair-mr2

Merge commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5' into eclair-mr2-plus-aosp

* commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5':
  Add account name / type query parameters for calendar Events.

core/java/android/provider/Calendar.java

@@ -583,6 +583,20 @@ public final class Calendar {
          */
         public static final Uri CONTENT_URI = Uri.parse("content://calendar/event_entities");
 
+        /**
+         * The name of the account instance to which this row belongs, which when paired with
+         * {@link #ACCOUNT_TYPE} identifies a specific account.
+         * <P>Type: TEXT</P>
+         */
+        public static final String ACCOUNT_NAME = "account_name";
+
+        /**
+         * The type of account to which this row belongs, which when paired with
+         * {@link #ACCOUNT_NAME} identifies a specific account.
+         * <P>Type: TEXT</P>
+         */
+        public static final String ACCOUNT_TYPE = "account_type";
+
         public static EntityIterator newEntityIterator(Cursor cursor, ContentResolver resolver) {
             return new EntityIteratorImpl(cursor, resolver);
         }