| commit | 868f3bbd3e3ee14e040133943f2ff49c04df46bb | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 09:35:02 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 09:35:02 2024 +0000 |
| tree | d274b86a8511d5cd327bd96da46d96e7f8f466f5 | |
| parent | 27207796c85a925519680959ee3aff05af2cc721 [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: I6dfe42e527e3ab08d035c75856192c3e0183e3ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>