commit | 1e9a27dcd3bc5cc807e0a25bb823733e7b990bce | [log] [tgz] |
---|---|---|
author | Matías Hernández <matiashe@google.com> | Fri Apr 05 13:50:04 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 13:50:04 2024 +0000 |
tree | 64121527fda14db1ea02628bc24597668495239f | |
parent | 487d2c00b8939a2ca494b9462c76e19fca06edfd [diff] | |
parent | 3c56a0c727ed185d69d663bd8f3c3d16d54fb944 [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: ed238556be -s ours am: 3c56a0c727 -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: Idbc2ea34b91732d26e593a9b8d2496bb0dd3e20c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>