tree d5f7b052a995871070c339b57127a02359e8576f
parent dd0685a6a6872e27fa3d0371afca312803c3981e
parent 31cfe34963d99f43283d6edd326d5ff58d9921ef
author Thiru Ramasamy <thiruram@google.com> 1593476321 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593476321 +0000

Merge "Fixes NPE with system shortcuts." into rvc-dev am: 6f5d4bb8ab am: fc49c2c54a am: 31cfe34963

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

Change-Id: I88d78190b1eac6f2bbeca105d6371d87a4d7b085