tree 64121527fda14db1ea02628bc24597668495239f
parent 1e9a27dcd3bc5cc807e0a25bb823733e7b990bce
parent b72e50fb48edf9628ee9ed749e8b35f9a5e3a8ef
author Matías Hernández <matiashe@google.com> 1712325039 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1712325039 +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: 58844b637c -s ours am: b72e50fb48 -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: Idfdf9cc2e0ca5f6a7411c0d431d3853597e27503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>