commit | c2df540693514640d9b5c68af975de4da64e6db7 | [log] [tgz] |
---|---|---|
author | Matías Hernández <matiashe@google.com> | Fri Apr 05 13:30:34 2024 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 13:30:34 2024 +0000 |
tree | 08e22cf276e46e655342b92c3f2e1d417618d6b4 | |
parent | 7678037b979026fe8acd36b22418fd0e2f7f1323 [diff] | |
parent | f9abb63e030e1a4c294c64528245fcd7b64850b5 [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: f9abb63e03 -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: I5c0a3f0d2e504265e76bc1e5ca0d990646572ef1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>