| commit | 0d94437d92339d17630f0d36f1e4d41162ccb05f | [log] [tgz] |
|---|---|---|
| author | Nate Jiang <qiangjiang@google.com> | Fri Jul 31 01:29:25 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Jul 31 01:29:25 2020 +0000 |
| tree | 4f49ba098ee188866b6901553147f1af36f59321 | |
| parent | 4da384efa31a68a7171a8b8a2314f7ac40418853 [diff] | |
| parent | dc885536a5a873e543868f5f1003dce89bd40192 [diff] |
[automerger skipped] Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: ca08926e89 am: 838b971cc4 am: b22c3b7f28 am: 7dba80ef0e am: dc885536a5 -s ours am skip reason: Change-Id Ia9a9b84c4587885a1a20327cbdec0b26eba0ba40 with SHA-1 4da384efa3 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380674 Change-Id: Ib6a9337a0afcc19511072569dd4a4be00ef6b738