tree 1ce65978f374b75ce51aca0b46b50865ae0a49b7
parent cc4438ac0b0f464fcb9c0a634797790582296199
parent 7e5e234668d53b2225ba869f3ce0e4bdf8b9428e
author Brian Isganitis <brianji@google.com> 1636576156 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636576156 +0000

Merge "Allow overriding getOptionsPopup test method." into sc-v2-dev am: bc1b36344f am: 7e5e234668

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

Change-Id: I59d603e5413c0a2b1f528fbfcef4d041c519502a