tree a5f9162442e35a93412f1f627b5fb355d2e41e46
parent 9f6e0f88d3f34660bbeb2f5f00ef145e344f4d04
parent 24ce95124ee191f9404b19989bf3391fd1794a12
author TreeHugger Robot <treehugger-gerrit@google.com> 1593460328 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593460328 +0000

Merge "Fixes NPE with system shortcuts." into ub-launcher3-rvc-dev am: 24ce95124e

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

Change-Id: Ifb267c2202b94d8d4c30f0485538ce3f7e6101d0