tree 6dcba98ccaec585a3e7993a60d3a08a6b1227415
parent 0c2b1bdad2314dab153eab1d906748f356f5f2ad
parent dcc5cfbaf055a0ebacd19c9d8eb47677b14be157
author Treehugger Robot <treehugger-gerrit@google.com> 1596059014 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596059014 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 785728770d am: 13ec568144 am: d0a6433acb am: 0600d18f66 am: dcc5cfbaf0

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

Change-Id: I50247400e315d8070775627ec981c7f93d9bdd30