tree beba09e42c450508996e8aafedf8a2d9ee5be74a
parent 0a973fee1b14d8f67935914b6dc3698172d0a4b5
parent b1b4562a46c9dd9ee017f29bddb0cc81efbd8712
author Hyunyoung Song <hyunyoungs@google.com> 1563494160 -0700
committer android-build-merger <android-build-merger@google.com> 1563494160 -0700

Merge "Guard against NPE inside BaseIconFactory Bug: 137253043" into ub-launcher3-qt-r1-dev
am: b1b4562a46

Change-Id: If97029ff59cc426db1dd4a7d433a5ab264eabeba