Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21410090 authored by Lorenz Nickel's avatar Lorenz Nickel Committed by Automerger Merge Worker
Browse files

Merge "Clarify that formatDateRange accepts a timezone id." am: aa458b25 am:... 

Merge "Clarify that formatDateRange accepts a timezone id." am: aa458b25 am: f599b933 am: b9a27df8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646619



Change-Id: Ied66612d822156a95efa0edf10dd3916bec02771
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e337974 b9a27df8

core/java/android/text/format/DateUtils.java

+1 −1
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ public class DateUtils 
     * @param startMillis the start time in UTC milliseconds

     * @param endMillis the end time in UTC milliseconds

     * @param flags a bit mask of options

     * @param timeZone the time zone to compute the string in. Use null for local

     * @param timeZone the id of the time zone to compute the string in. Use null for local

     * or if the FORMAT_UTC flag is being used.

     *

     * @return the formatter with the formatted date/time range appended to the string buffer.