tree 02adf9f9248d88ce71e2e12edf8467afa2c880f3
parent ca2402d8ebd333ffa0941a9baabe17eb365c28a7
parent 1cdaab7bda0db6bfc26c2273996363a90f2c4c8b
author Xevi Miro Bruix <xevi@google.com> 1595873094 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595873094 +0000

Merge "Update language to comply with Android’s inclusive language guidance" am: 698bcc6a30 am: 1cdaab7bda

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1371179

Change-Id: Ic66bf514332fa57e0c11a2676131bda957dea99c