tree 8902e941962048e5fb7f0acecec6e754b3a4c0dc
parent 0afd598570af8f81ab72c027489aefe0bce51a9a
parent e0729a2cefd1d3f8d331621035721c36294dfc5c
author Evan Rosky <erosky@google.com> 1630461588 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1630461588 +0000

Merge "Fix NPE that happens occasionally on start-up" into sc-v2-dev am: 8a0e91b330 am: e0729a2cef

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

Change-Id: I19688906ad851ec0778bd07a48f175bd571a514b