tree ddb1f07a3128adeb88243d3ed504789232d3034e
parent aae8321566f020ee92f46b8f950232e9ade711cc
parent ad5278bb1ba4727e6de1a1f652338617ba04e97e
author Treehugger Robot <treehugger-gerrit@google.com> 1596058898 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596058898 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 5503e62f45 am: afa4198536 am: 5c01b59fe7 am: 9972ae0e93 am: ad5278bb1b

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1375339

Change-Id: I9cd5d40233e7afc80c222e54735f72c196330fb8