tree 6e1f9a2dcaa9b81c3613e970a754a7af4d67ed26
parent 6e19c653a8a2762b27bdcec36edda54462e43fbe
parent 7b16a62bb28bf221546ddb8fb6cc39c5bc90fbe2
author Vineel Sadineni <vsadineni@google.com> 1706300375 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1706300375 +0000

[automerger skipped] Merge "Make MoreOptionsScope abstract class" into main am: 62d6ccd106 am: 7b16a62bb2 -s ours

am skip reason: Merged-In Iced9df83f600c86cc409abc040fb9ace0dcedf1e with SHA-1 97d36b771a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2928196

Change-Id: I8ed92b8919ee5e45e6d5c0dda47edf83da83025c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>