tree 293731bfa5bf5970f42d4e878c76d3806fdcde67
parent 0a3ae689342e0e8486346b50790ecc9c7be4c851
parent 199644c397ba01b5d8728a781d47552c3f053670
author Jonathan Miranda <jonmiranda@google.com> 1638298080 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1638298080 +0000

Merge "Fix NPE in FloatingIconView" into sc-v2-dev am: 199644c397

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

Change-Id: Id2c8303401239da3a92eaeaa05d9dc47412831d0