commit 60306788d571f234883d9833a97216c40289d0cf
author Michael Chan <mchan@android.com> Thu Aug 02 22:21:39 2012 -0700
committer Michael Chan <mchan@android.com> Thu Aug 09 15:47:24 2012 -0700
tree 97c7bee3bc66f4a7d0534adb2f6e5815832d39b8
parent 71d2e3bc11937878caad849781e6124290adac9f

Renamed calendarcommon to calendarcommon2 to avoid naming conflict with OEM devices

Change-Id: I4f0c50fb4906d356aa4e6283d0d863ebd9c233ee

src/com/android/exchange/adapter/CalendarSyncAdapter.java

diff --git a/src/com/android/exchange/adapter/CalendarSyncAdapter.java b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
index 44a0ca0..6525610 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -43,8 +43,8 @@
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.android.calendarcommon.DateException;
-import com.android.calendarcommon.Duration;
+import com.android.calendarcommon2.DateException;
+import com.android.calendarcommon2.Duration;
 import com.android.emailcommon.AccountManagerTypes;
 import com.android.emailcommon.provider.EmailContent;
 import com.android.emailcommon.provider.EmailContent.Message;

src/com/android/exchange/utility/CalendarUtilities.java

diff --git a/src/com/android/exchange/utility/CalendarUtilities.java b/src/com/android/exchange/utility/CalendarUtilities.java
index a3da002..1df14c4 100644
--- a/src/com/android/exchange/utility/CalendarUtilities.java
+++ b/src/com/android/exchange/utility/CalendarUtilities.java
@@ -35,8 +35,8 @@
 import android.util.Base64;
 import android.util.Log;
 
-import com.android.calendarcommon.DateException;
-import com.android.calendarcommon.Duration;
+import com.android.calendarcommon2.DateException;
+import com.android.calendarcommon2.Duration;
 import com.android.emailcommon.Logging;
 import com.android.emailcommon.mail.Address;
 import com.android.emailcommon.provider.Account;