tree 8f42c6a3d724afc3a6967448cf4c6468d30eb9b1
parent 19847945d95bcdc5ef24dc0ffcb796140f4283f6
parent ff0a6eab188a99d7548c7a64060c1754337af52b
author Treehugger Robot <treehugger-gerrit@google.com> 1595968482 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595968482 +0000

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

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

Change-Id: Ic52b887978dca4791d2d80ace3473a26141f0cc3