tree 90e5eb61137a169481571a7a473d1e8d11a2e91f
parent 2abbd9f960f82a6a6a8a9f162bcc9c27dc85c78e
parent 8e7fd4347dbe606b3a428e8663d2540d16b0d558
author Treehugger Robot <treehugger-gerrit@google.com> 1596654573 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596654573 +0000

[automerger skipped] Merge "AOSP/Launcher3 - Update language to comply with Android's inclusive language guidance.  DO NOT MERGE" am: af6968dcec am: c7e0fc92e2 -s ours am: f617d254ca am: d528e9dc72 am: 8e7fd4347d -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/1389245

Change-Id: I13b989274db7d3ddaa09d318b122ccb81d9dcee4