Merge "[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 9c3acacc5c -s ours" into rvc-dev-plus-aosp am: 4f547ed394 -s ours am: 4439de64d5 -s ours

Browse Source

am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 2349cf350b is in history

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

Change-Id: Ib217f70780c55828d2705f856af135db53e87710

...

This commit is contained in:

Automerger Merge Worker

2020-08-03 22:03:43 +00:00

parent 03f0c69df2 4439de64d5

commit 21fba22687

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