tree 36042b552b7ceeec3409e537fab460d0c59a8ddd
parent 987ba0261f9de50af682ce40c0fb5fdc2699119f
parent 6f5d4bb8ab5cee74de5b82e8db2c2957cbda3296
author Thiru Ramasamy <thiruram@google.com> 1593474699 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593474699 +0000

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

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

Change-Id: Iab463bb1eadf656973f7ee8ccbcd32dbbc056101