| commit | ed238556be07e06d60cb8c677c1aa67b50ed4140 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 13:12:24 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 13:12:24 2024 +0000 |
| tree | f4721f0fb90ec2e4a4fef59f98b3c55012b451dd | |
| parent | 2da5417935ceef74920296145cafcc37b354e34f [diff] | |
| parent | 1aed8c177a9e14c6df7bd9188211d0b342fe7615 [diff] |
[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: eff2f722c3 -s ours am: 1aed8c177a -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: Idca48eb17346501a9187b0b848c22eb8bc42e99f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>