| commit | b72e50fb48edf9628ee9ed749e8b35f9a5e3a8ef | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 13:30:25 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 13:30:25 2024 +0000 |
| tree | 76017ea6bcde7debdd6665095598bc610acf70e8 | |
| parent | 3c56a0c727ed185d69d663bd8f3c3d16d54fb944 [diff] | |
| parent | 58844b637cb20cd21860da77404a3681ba198a38 [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: 4f141c5bcc -s ours am: 58844b637c -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: I94d672c46930bf60234ccb9bc1c26c04668f14ea Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>