tree b0dd893733e8a731389a2de01dfc3e4dd3ced87c
parent 854deace36def5bd5c2009ce2259d7b56dac7bb7
parent 7787848788c38c2d23fce8585ea412c7bc2e8b2a
author Hyunyoung Song <hyunyoungs@google.com> 1596129593 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1596129593 +0000

[automerger skipped] Merging ub-launcher3-rvc-qpr-dev to rvc-qpr-dev am: 45c0918f47 am: 7787848788 -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/+/12262084

Change-Id: Ie30c674405d296a3783e801936536cfb17b68865