Renamed calendarcommon to calendarcommon2 to avoid naming conflict with OEM devices
Change-Id: Ia765b4c17bfc00e283c66c440b8561fcd7b8e4dc
diff --git a/src/com/android/providers/calendar/CalendarInstancesHelper.java b/src/com/android/providers/calendar/CalendarInstancesHelper.java
index b549eb9..356b442 100644
--- a/src/com/android/providers/calendar/CalendarInstancesHelper.java
+++ b/src/com/android/providers/calendar/CalendarInstancesHelper.java
@@ -16,11 +16,11 @@
package com.android.providers.calendar;
-import com.android.calendarcommon.DateException;
-import com.android.calendarcommon.Duration;
-import com.android.calendarcommon.EventRecurrence;
-import com.android.calendarcommon.RecurrenceProcessor;
-import com.android.calendarcommon.RecurrenceSet;
+import com.android.calendarcommon2.DateException;
+import com.android.calendarcommon2.Duration;
+import com.android.calendarcommon2.EventRecurrence;
+import com.android.calendarcommon2.RecurrenceProcessor;
+import com.android.calendarcommon2.RecurrenceSet;
import com.android.providers.calendar.CalendarDatabaseHelper.Tables;
import android.content.ContentValues;
diff --git a/src/com/android/providers/calendar/CalendarProvider2.java b/src/com/android/providers/calendar/CalendarProvider2.java
index 0bc80c5..3b11e20 100644
--- a/src/com/android/providers/calendar/CalendarProvider2.java
+++ b/src/com/android/providers/calendar/CalendarProvider2.java
@@ -54,11 +54,11 @@
import android.util.TimeFormatException;
import android.util.TimeUtils;
-import com.android.calendarcommon.DateException;
-import com.android.calendarcommon.Duration;
-import com.android.calendarcommon.EventRecurrence;
-import com.android.calendarcommon.RecurrenceProcessor;
-import com.android.calendarcommon.RecurrenceSet;
+import com.android.calendarcommon2.DateException;
+import com.android.calendarcommon2.Duration;
+import com.android.calendarcommon2.EventRecurrence;
+import com.android.calendarcommon2.RecurrenceProcessor;
+import com.android.calendarcommon2.RecurrenceSet;
import com.android.providers.calendar.CalendarDatabaseHelper.Tables;
import com.android.providers.calendar.CalendarDatabaseHelper.Views;
import com.google.android.collect.Sets;
diff --git a/tests/src/com/android/providers/calendar/ICalendarTest.java b/tests/src/com/android/providers/calendar/ICalendarTest.java
index 4a740a9..28bc73b 100644
--- a/tests/src/com/android/providers/calendar/ICalendarTest.java
+++ b/tests/src/com/android/providers/calendar/ICalendarTest.java
@@ -1,7 +1,7 @@
// Copyright 2007 The Android Open Source Project
package com.android.providers.calendar;
-import com.android.calendarcommon.ICalendar;
+import com.android.calendarcommon2.ICalendar;
import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;
diff --git a/tests/src/com/android/providers/calendar/RecurrenceSetTest.java b/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
index 2ce7167..f8b3704 100644
--- a/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
+++ b/tests/src/com/android/providers/calendar/RecurrenceSetTest.java
@@ -16,8 +16,8 @@
package com.android.providers.calendar;
-import com.android.calendarcommon.ICalendar;
-import com.android.calendarcommon.RecurrenceSet;
+import com.android.calendarcommon2.ICalendar;
+import com.android.calendarcommon2.RecurrenceSet;
import android.content.ContentValues;
import android.provider.CalendarContract;
