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

Commit 1d66281e authored by Neil Fuller's avatar Neil Fuller Committed by Android Git Automerger
Browse files

am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change" 

* commit '59b24040':
  Fix javadocs based on recent case consistency change
parents 533d164e 59b24040

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

+2 −2
Original line number Diff line number Diff line
@@ -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".