tree 4bd62b87eadddf1cf52907826ee918ea6df2588e
parent 5118ee7309ad95f00f28eb8956bb63c9040c01e5
parent c7e0fc92e23857a1c6a9eede34fef8faf4069c27
author Treehugger Robot <treehugger-gerrit@google.com> 1596651017 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596651017 +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 skip reason: subject contains skip directive

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

Change-Id: I2fdfd4d0e070d887121b53d557114083d4ed9501