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

Commit 21ddfb5a authored by vichang's avatar vichang Committed by Automerger Merge Worker
Browse files

Merge "Update language in android.text.format to comply with Android’s... 

Merge "Update language in android.text.format to comply with Android’s inclusive language guidance" am: f7b2126b am: 80a5722b am: ecf22c35

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1373056

Change-Id: Ie154dc167b1b858222f6eb7f9c9a6235df272f19
parents b507bdd4 ecf22c35

core/java/android/text/format/DateIntervalFormat.java

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public final class DateIntervalFormat { 


    /**

     * Format a date range. This is our slightly more sensible internal API.

     * A truly sane replacement would take a skeleton instead of int flags.

     * A truly reasonable replacement would take a skeleton instead of int flags.

     */

    @VisibleForTesting(visibility = PACKAGE)

    public static String formatDateRange(ULocale icuLocale, android.icu.util.TimeZone icuTimeZone,