tree ecdbd42172de6589f879fa5be816ec83cc0b158e
parent 9a9faeb2e9d425b9afe01556896c9a36b3bc4c62
parent 2db3ded7f9ea57613358f168d09d5d6727c792cd
author Lucas Dupin <dupin@google.com> 1613607059 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1613607059 +0000

Merge "Conform to new naming" into sc-dev am: 2db3ded7f9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b9c18ccf204d5fa5b92bbde1e9e8b388daf3d1c