tree 1ce65978f374b75ce51aca0b46b50865ae0a49b7
parent 03baae471cd566b5d2b5193c23ce19894ccbf34b
parent 23b37b7ac4727062c0515cfe67fea3fe6cbbf3a7
author Brian Isganitis <brianji@google.com> 1636576867 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1636576867 +0000

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

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

Change-Id: I39ce59aa9c773742e8b2b2f899459e1c81c321df