am 31f8e910: Merge "Revert "Fixed the problem with the calendar sort order using the column name""
am 31f8e910: Merge "Revert "Fixed the problem with the calendar sort order using the column name""

* commit '31f8e910289264fc3479bba43e5e37c4e50df8c8':
  Revert "Fixed the problem with the calendar sort order using the column name"

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base