tree 714145b258d779963615878f352f68a2f2bed498
parent 9c407861ada2291caffb71792f710881e6e5e78d
parent b6d56531c2a41b3e61ef913e94c76752d8869a52
author Tony Wickham <twickham@google.com> 1598078611 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1598078611 +0000

[automerger skipped] Merging from ub-launcher3-rvc-qpr-dev @ build 6777894 am: 0486a03832 am: b6d56531c2 -s ours

am skip reason: Change-Id I0bb722c8f29e91cb382337f8b11bcf43d711949b with SHA-1 9c407861ad is in history

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

Change-Id: Ie7d264e7c6cd304aa5a67f63e043efc9a5950f09