summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Lorenz Nickel <lorenznickel@google.com> 2023-06-30 14:59:15 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-30 14:59:15 +0000
commit358ce46e2c18b66f35c344e4920b82bd8745ec91 (patch)
tree804a3d6db9503c69afd826a57bbdfb3c6b44a89e
parent61dfe9b9b65c8260ba210dfe2d4590a2042aee3e (diff)
parent512bdf1c0448e2e8729acf5a8f1207af49867179 (diff)
Merge "Clarify that formatDateRange accepts a timezone id." am: aa458b25f9 am: f599b933a0 am: b9a27df8a2 am: 2141009033 am: 47a8ef3829 am: 512bdf1c04
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2646619 Change-Id: I5fe3c94ace1e9c6182f5151ce1da41bd326393f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/java/android/text/format/DateUtils.java2
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.