Merge "Update language to comply with Android's inclusive language guidance" am: ec88a69b00

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

Change-Id: I31cc434c25112b9c51d0f86820dde555ee71e7bc
This commit is contained in:
Treehugger Robot
2020-07-29 20:20:43 +00:00
committed by Automerger Merge Worker

View File

@@ -397,7 +397,7 @@ public class Clock extends TextView implements DemoMode, Tunable, CommandQueue.C
mContentDescriptionFormat = new SimpleDateFormat(format);
/*
* Search for an unquoted "a" in the format string, so we can
* add dummy characters around it to let us find it again after
* add marker characters around it to let us find it again after
* formatting and change its size.
*/
if (mAmPmStyle != AM_PM_STYLE_NORMAL) {