tree 8fa37cec2c32846fdbf1c6636467a04d38bb4c54
parent 325fd2a5f13a5479b9cb65ad96571be61ee19fb9
parent aebbf0964556ff4ba1ef918e4042212528c9159e
author Julia Reynolds <juliacr@google.com> 1694624810 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1694624810 +0000

[automerger skipped] Disable priority conversation widget for secondary users am: b0522df0a3 -s ours am: c739548463 -s ours am: 2f082e1a70 -s ours am: 17f9c96594 -s ours am: c90335ef68 -s ours am: aebbf09645 -s ours

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

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

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