tree c5e951c348bb6c1ee421f6f4968e5878bfb740b9
parent b3247940dce3d7b88f2aace5bb341b4774284530
parent 2de2db9e0ce65a7c517a7de31f01b0f7d1f2df8a
author Kelly Rossmoyer <krossmo@google.com> 1596070186 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596070186 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 3261ea7b0a am: eeb9df2066 am: 2de2db9e0c

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

Change-Id: I4648745ab172b40ce468771ce673d64edf802863