tree 425ddde9eb596b21449b12f0f55c68ec87c74292
parent a2a13d0c457c433aa182f37dc6e5ea34d6c673e2
parent d92dacc7eb3e3eb1f5611583abb2e4c522d4b789
author Julia Reynolds <juliacr@google.com> 1693958973 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1693958973 +0000

[automerger skipped] Merge "Disable priority conversation widget for secondary users" into sc-v2-dev am: a665e2d316 am: e8f41307f6 am: 25b8fa5e7d -s ours am: d92dacc7eb -s ours

am skip reason: Merged-In I3f3991d2cb7fb9970cc8ada39ceae9a7ff2fcb31 with SHA-1 dd044a6cad is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24575248

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