[automerger skipped] Merge "Update language to comply with Android’s inclusive language guidance." am: bdfb45d841 am: 7f45a6fcc0 -s ours

Browse Source

am skip reason: Change-Id I5059d8362a02a7b4622c71fdf15297af87c5a3dd with SHA-1 759c96a3d4 is in history

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

Change-Id: I47ccfab7dd61ebd29360ed5bf012942f2547c0d0

...

This commit is contained in:

Sudheer Shanka

2020-08-13 20:17:25 +00:00

committed by Automerger Merge Worker

parent 6a55cd1644 7f45a6fcc0

commit a47e1f9a24

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