tree 7b88a1b5ab70e8785f042647237d00c2f2cd7791
parent c1439e6bb236b4a81875ffa545b1b26624e03469
parent 2dfbf5c87c092dad5ea871e4a17b02836acdff81
author Hsin-Yi Chen <hsinyichen@google.com> 1595995127 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595995127 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 7ee1f8e6a9 am: 47eeb27cb1 am: 65707f3c0b am: 0a664e383b am: 2dfbf5c87c

Original change: https://android-review.googlesource.com/c/platform/development/+/1374197

Change-Id: I2cd44e50eb497ae0d3b53a7945af3c9be67beefa