| commit | b45488a34e8c5e50598570d4a26a297392965569 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 12:53:34 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 12:53:34 2024 +0000 |
| tree | d9c4918ce22d13b318d698a95af43b39d89f5c72 | |
| parent | 12c0aa5918120f7df74dd7c96f93f551a556a83b [diff] | |
| parent | 9f3f1a12280af80a5a3b475098ab176d1ca90792 [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 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: Ia5b5b379f47d1c85863090e5a7184dcfe0524f76 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>