tree 19ebb2ff9dfaa104335d6f513f8a1c8f712e64be
parent 989074073c5604d7d5e6b0225bac487c17daf727
parent eb7588633467ff705521516324aedf38fe189177
author Chiachang Wang <chiachangwang@google.com> 1596005526 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596005526 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 577c469d6b am: 156ea0167e am: a3b25d71a9 am: eb75886334

Original change: https://android-review.googlesource.com/c/platform/cts/+/1373261

Change-Id: If6d13d7736b3d8bb6e87a8e850bf8328a25e73af