tree 71116fb46d679bd0b974e3b4a9babc84a46586d9
parent 326ac3b06be812a6c84814e07d30f849c4564fa9
parent dd2b8b6f2ed89b7b6fb45faa400db6f475c45bb4
author Andy Wickham <awickham@google.com> 1617658683 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617658683 +0000

Merge "Updates OptionsPopupView to allow non-resource strings/icons." into sc-dev am: dd2b8b6f2e

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

Change-Id: Ice9dfa8bada21f5248d22f1f5124a316b21122f0