tree d5f7b052a995871070c339b57127a02359e8576f
parent ed5ea6df5fb4d4c0076ab2b3927e013e27b2e796
parent 72f986af2845bb167005fd8caaff6cdfa800321a
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593475514 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1593475514 +0000

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