tree d274b86a8511d5cd327bd96da46d96e7f8f466f5
parent 0f3859faae266700f701863d0f5bbba2808b7171
parent 4f141c5bcc3c695d98706c68f807e998a4341488
author Matías Hernández <matiashe@google.com> 1712322791 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712322791 +0000

[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into sc-dev am: 579df7d189 am: 27db525979 am: 63fc3a33b5 -s ours am: fc8e0c7aa2 -s ours am: 9f3f1a1228 -s ours am: b45488a34e -s ours am: 4f141c5bcc -s ours

am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 83975c5157 is already in history

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

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