tree ce67610e3091e7a291d6ae3b5c5b05a588a23a7b
parent 36c2d4369362389aa81a44ac5bee80807ccb6c51
parent 9d71a8eb4fe819a60b29c0ed96ac2384bf1f71fc
author Christofer Åkersten <akersten@google.com> 1596149000 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596149000 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 5a98e16b96 am: 1443865edb am: 9d71a8eb4f

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TV/+/1380002

Change-Id: Ie3266087c3c78c1bc7e7d70c5f8ebeb657b683f2