summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Neil Fuller <nfuller@google.com> 2015-06-01 12:14:47 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2015-06-01 12:14:47 +0000
commit59b240404f19f3450e710e07a90d4e8d35fabcaf (patch)
tree7332ac9399a3fce0e3502a00e18dc31a3f3faba9
parent0189c6efed4f36db0661d827d998a49bc34ece12 (diff)
parente761938c39c1cafa80d0c474e107041316a49cbd (diff)
am e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit 'e761938c39c1cafa80d0c474e107041316a49cbd': Fix javadocs based on recent case consistency change
-rw-r--r--core/java/android/text/format/DateUtils.java4
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 ac98e8a67cc2..14ebec7340e1 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".