tree 5febc97c2ac73e5067a0bfacbfebc41de7e97136
parent 114db099349ec14af68c5a7986231d55940b8f2d
parent 36b568cbb1d14e2d92440a7acb032c66c78fce95
author Hyunyoung Song <hyunyoungs@google.com> 1595478563 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595478563 +0000

[automerger skipped] Merge "Merging from ub-launcher3-rvc-qpr-dev @ build 6690853" into rvc-qpr-dev am: aae7f2b638 am: 36b568cbb1 -s ours

am skip reason: Change-Id Ibff46b3ef7ff89accb459db323f31179adb4ef21 with SHA-1 928a421b99 is in history

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

Change-Id: I0b0cfbb7133be9b25320b07240248d3f5158e7ab