| commit | f12466f86c271ac62d6190e0753cd39de6628fb3 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 09:43:07 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 09:43:07 2024 +0000 |
| tree | 9906a05be6cf0765bea2ca7dd9baabe76ca259fe | |
| parent | c7638d9933b04d1c041eaad984a2cde3ca40c256 [diff] | |
| parent | 27207796c85a925519680959ee3aff05af2cc721 [diff] |
[automerger skipped] Merge "Resolve message/conversation image Uris with the correct user id" into tm-dev am: 0857f7e9c1 am: 69940bb054 -s ours am: 81f8087a1a -s ours am: 27207796c8 -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: I51ade3b516c3604cb716f9738237fcee79d8b86e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>