| commit | 2da5417935ceef74920296145cafcc37b354e34f | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 09:34:59 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 09:34:59 2024 +0000 |
| tree | f4721f0fb90ec2e4a4fef59f98b3c55012b451dd | |
| parent | 65daf3cf9142a540f0e65d85b703a70f3b1eee50 [diff] | |
| parent | 14685ecab867108a277dcbabf5c0747926006490 [diff] |
[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-dev am: 0857f7e9c1 am: 2e89641c23 -s ours am: 12c0aa5918 -s ours am: 14685ecab8 -s ours am skip reason: Merged-In I11c5b39f2d9d8f0788acab43640a6d4abcd5a179 with SHA-1 a63ab76113 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26700367 Change-Id: I63e52ecd5cd705ea9f9c0ac1bd9883ed063c586f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>