tree 54236b44416ae330ec204e1871c902b6568c1829
parent 6f608f17709fd55172d97400ab9dd081ccfeadc2
parent c70025945b0b1801f90f210d3a8f73bd467a88ed
author Chiachang Wang <chiachangwang@google.com> 1597229910 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597229910 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 2dd299c5db am: 0e7aefd000 am: 139402e852 am: 7ca59bc74f am: c70025945b

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

Change-Id: Ib455b42f7f360b75a295f86fd5166125fd0f69aa