tree 256f06a5ebcb6e03153f3ee6e3d363b6e69ddfdd
parent fd5ab3e01bc8a229156de7e5cad09338b3c79d92
parent 3ca65c6b2be150cbd89eedb67369f1166170b1c4
author Alex Light <allight@google.com> 1596489957 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596489957 +0000

[automerger skipped] Merge "Update language to comply with Android's inclusive language guidance" am: 56f5e6595b am: 3ca65c6b2b -s ours

am skip reason: Change-Id I971050a2665c177870ff257bd0f41343db702892 with SHA-1 862858dc88 is in history

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

Change-Id: I267d10e1c9875e011c474ac1911a5a737cb3a86f