| commit | 4f141c5bcc3c695d98706c68f807e998a4341488 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 13:05:55 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 13:05:55 2024 +0000 |
| tree | 604476447e09787a078a8de3dd4c965b113e8b91 | |
| parent | 1aed8c177a9e14c6df7bd9188211d0b342fe7615 [diff] | |
| parent | b45488a34e8c5e50598570d4a26a297392965569 [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: 9f3f1a1228 -s ours am: b45488a34e -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: I4171b6631f5de1d09340ea468c35bbb4134889f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>