tree d229a387a893ecda9f16e4554aa54680740794fa
parent 4595166bf5ee5ba3e11ab989f5c7b1468ada0d32
parent 096d17908162396efad6372e60460b229bec74ce
author Tony Wickham <twickham@google.com> 1597765853 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1597765853 +0000

[automerger skipped] Merging from ub-launcher3-rvc-qpr-dev @ build 6770831 am: fa9675a32e am: 096d179081 -s ours

am skip reason: Change-Id I5e9c73a7ac3033fe82006c4bd72824f56b8988f8 with SHA-1 4595166bf5 is in history

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

Change-Id: I2c81d6bc4b60c7ac923ca57d1c6150ac89d70d13