Merge "Revert "Fixed the problem with the calendar sort order using the column name""
diff --git a/core/java/android/provider/CalendarContract.java b/core/java/android/provider/CalendarContract.java
index 9ba1fdb..6fe5124 100644
--- a/core/java/android/provider/CalendarContract.java
+++ b/core/java/android/provider/CalendarContract.java
@@ -599,7 +599,7 @@
         /**
          * The default sort order for this table
          */
-        public static final String DEFAULT_SORT_ORDER = CALENDAR_DISPLAY_NAME;
+        public static final String DEFAULT_SORT_ORDER = "displayName";
 
         /**
          * The name of the calendar. Column name.