[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 267cc11642 am: 711a4b4b2d -s ours am: 8ce269efa4 -s ours

Browse Source

am skip reason: Change-Id I915e09e4e64d5c268630cec2d0ef05ea0592fd6f with SHA-1 bde40af6ca is in history

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

Change-Id: I06cf44ce9b88a376d7d23d8e9f0be4c19d3aba92

...

This commit is contained in:

Jason Hsu

2020-08-24 11:52:46 +00:00

committed by Automerger Merge Worker

parent a017206faa 8ce269efa4

commit a50e74fc84

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available