Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix javadocs based on recent case consistency change"

Browse Source
This commit is contained in:
Neil Fuller
2015-06-01 12:01:44 +00:00
committed by Gerrit Code Review
parent dd78330140 0e1c0e11e4
commit e761938c39
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/text/format/DateUtils.java
View File

@@ -258,7 +258,7 @@ public class DateUtils
* Returns a string describing 'time' as a time relative to 'now'. * Returns a string describing 'time' as a time relative to 'now'.
* <p> * <p>
* Time spans in the past are formatted like "42 minutes ago". * 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 time the time to describe, in milliseconds
* @param now the current time 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'. * Returns a string describing 'time' as a time relative to 'now'.
* <p> * <p>
* Time spans in the past are formatted like "42 minutes ago". Time spans in * 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> * <p>
* Can use {@link #FORMAT_ABBREV_RELATIVE} flag to use abbreviated relative * Can use {@link #FORMAT_ABBREV_RELATIVE} flag to use abbreviated relative
* times, like "42 mins ago". * times, like "42 mins ago".