Merge "Adds a time zone parameter to formatDateRange" into gingerbread