diff options
| author | 2023-06-30 13:29:48 +0000 | |
|---|---|---|
| committer | 2023-06-30 13:29:48 +0000 | |
| commit | 21410090334be8942c4b3e9ee136888de9f18455 (patch) | |
| tree | 84586a1f62e224e6f804620d4e3634a8a2aec7d9 | |
| parent | 9e3379746fd2c56af71dcabdddcc24dcf079d888 (diff) | |
| parent | b9a27df8a293b51987cf0eb6a40c24f1178e8032 (diff) | |
Merge "Clarify that formatDateRange accepts a timezone id." am: aa458b25f9 am: f599b933a0 am: b9a27df8a2
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646619
Change-Id: Ied66612d822156a95efa0edf10dd3916bec02771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | core/java/android/text/format/DateUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index 511c9746c84c..518a5498d6ed 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -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. |