Commit 0f813ef3 authored Jul 28, 2020 by vichang Committed by Automerger Merge Worker Jul 28, 2020

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 am: 21ddfb5a

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

Change-Id: Ib234bb0b71587b1659356f5c271e7420960a902d

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,