tree 9cde8836ce9d65fe0109c24c7a4a3d68c96aa62d
parent c6564bee2ad09e67adf90eec27b947f490aede18
parent 9dece9ac4269ca27ff98d868545d783f22ffe7e3
author Sudheer Shanka <sudheersai@google.com> 1597687676 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597687676 +0000

Merge "Update language to comply with Android’s inclusive language guidance." am: 255d5a9270 am: 3e43926852 am: 9dece9ac42

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

Change-Id: I80af4aca41f2b00af7e96b7a44be2398983a6a73