tree ed14554aaecd0ebe02055abf3d5f2c799a5a06e3
parent ae66cfafdc7aeb33b25cbe58a9deee8dc335cbfe
parent dd2b8b6f2ed89b7b6fb45faa400db6f475c45bb4
author Andy Wickham <awickham@google.com> 1617658782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1617658782 +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: If0a4cd0d930f9ee232ecc530c87e7f52d7b891bb