tree 7e79f183238843801ea69ff4331a61bc0e1e3193
parent 8b74c7a26bdc759afed24d0635a46203f16a3060
parent 57f700d719b66c9fc402c2b627ba64afd6293f3c
author Treehugger Robot <treehugger-gerrit@google.com> 1596248673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596248673 +0000

Merge "Update language to comply with Android's inclusive language guidance" am: 49d4511e97 am: 57f700d719

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/wifi/+/1384348

Change-Id: I646bd573424c3b6ecec083909b0096750f276da6