tree d5f7b052a995871070c339b57127a02359e8576f
parent 39dff6156c978a9dbd55d8e63df5bda4529b56cf
parent 2c82e23920ab623fb69df848a05bfbaa5d2cd166
author Thiru Ramasamy <thiruram@google.com> 1593475506 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593475506 +0000

Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab am: 2c82e23920

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

Change-Id: I34f37934ea5c95764db96865c2323d84d9e6c8c1