commit ff1af297676c0c86c72c6639785d7773ed9ce486
author Marc Blank <mblank@google.com> Tue May 25 14:31:18 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue May 25 14:31:18 2010 -0700
tree b006b955e1b72d28818620ad493830707d0a0c69
parent 4c8adbc4aa81308e57ae129e9587ec50483af6a8
parent 8752159c7d081e7ea4d870ae29de6e58da7d50be

am 8752159c: Fix critical typo in CalendarSyncAdapter

Merge commit '8752159c7d081e7ea4d870ae29de6e58da7d50be' into froyo-plus-aosp

* commit '8752159c7d081e7ea4d870ae29de6e58da7d50be':
  Fix critical typo in CalendarSyncAdapter

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 07b55e6..c44caf5 100644
--- a/src/com/android/exchange/adapter/CalendarSyncAdapter.java
+++ b/src/com/android/exchange/adapter/CalendarSyncAdapter.java
@@ -131,7 +131,7 @@
     private final TimeZone mLocalTimeZone = TimeZone.getDefault();
 
     // Change this to use the constant in Calendar, when that constant is defined
-    private static final String EVENT_TIMEZONE2_COLUMN = "eventTimeZone2";
+    private static final String EVENT_TIMEZONE2_COLUMN = "eventTimezone2";
 
     private long mCalendarId = -1;
     private String mCalendarIdString;