| commit | 825e851fe49adc6436b516bcfddd179b00f71068 | [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 | a45009e00eeb9c5cdfdb83d255a1ebd50a705eda | |
| parent | 5be413573a4b50d20dc8b69b54601521f4ae5862 [diff] | |
| parent | 2474b5d84431021b4c8ad0a4ca394ef478b54258 [diff] |
[automerger skipped] Merge "[Wifi] Update language to comply with Android’s inclusive language guidance" am: 5be65d0810 am: 838b971cc4 am: e790db3aab am: d48423561e am: 2474b5d844 -s ours am skip reason: Change-Id Ia9a9b84c4587885a1a20327cbdec0b26eba0ba40 with SHA-1 9486831d53 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1380674 Change-Id: Ib6a9337a0afcc19511072569dd4a4be00ef6b738