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

Commit ecf22c35 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

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

Change-Id: I453f4d3d600865773861dcb6e78c51185cd037f9
parents e5f8970c 80a5722b

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,