tree 6f6490c08b49eee94040fe6dda9b6a06a3f064ce
parent 17c2d70b04cc186e6a89bde463bf9432097d61d5
parent c61b2279f02502c1de78ff3ba81b42a2cf39b783
author Xevi Miro Bruix <xevi@google.com> 1595873162 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595873162 +0000

Merge "Update language to comply with Android’s inclusive language guidance" am: c61b2279f0

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

Change-Id: Ia443e58c97ae29fa8fb7935fae39948405288b6e