tree 47efb983412f2dafa8c1d4a815dddc33830338fc
parent 0a6a977dfed2bec90e3a6c4b5d80cfc36f5454a7
parent cc2d51fcef4767ce92e517fe364ed0cf941c59ed
author Treehugger Robot <treehugger-gerrit@google.com> 1596025564 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596025564 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: cc2d51fcef

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

Change-Id: Ibe3a20b81d84de18f0659aba80469d7a2e517521