diff options
| author | Neil Fuller <nfuller@google.com> | 2015-06-01 12:04:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-01 12:04:44 +0000 |
| commit | 3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27 (patch) | |
| tree | 0e453c474861bcf9565c8e6b92836b57a2b1a1fa /core | |
| parent | ab06923576d4a49bc84c94badfcebcb7f6b103a8 (diff) | |
| parent | a5e389ddd214c41c8de47bdbf71e3a3eacd7e5fb (diff) | |
| download | frameworks_base-3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27.zip frameworks_base-3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27.tar.gz frameworks_base-3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27.tar.bz2 | |
Merge "Fix javadocs based on recent case consistency change" into mnc-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/text/format/DateUtils.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/text/format/DateUtils.java b/core/java/android/text/format/DateUtils.java index ac98e8a..14ebec7 100644 --- a/core/java/android/text/format/DateUtils.java +++ b/core/java/android/text/format/DateUtils.java @@ -258,7 +258,7 @@ public class DateUtils * Returns a string describing 'time' as a time relative to 'now'. * <p> * Time spans in the past are formatted like "42 minutes ago". - * Time spans in the future are formatted like "in 42 minutes". + * Time spans in the future are formatted like "In 42 minutes". * * @param time the time to describe, in milliseconds * @param now the current time in milliseconds @@ -275,7 +275,7 @@ public class DateUtils * Returns a string describing 'time' as a time relative to 'now'. * <p> * Time spans in the past are formatted like "42 minutes ago". Time spans in - * the future are formatted like "in 42 minutes". + * the future are formatted like "In 42 minutes". * <p> * Can use {@link #FORMAT_ABBREV_RELATIVE} flag to use abbreviated relative * times, like "42 mins ago". |