| commit | 7678037b979026fe8acd36b22418fd0e2f7f1323 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 13:29:52 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 13:29:52 2024 +0000 |
| tree | 08e22cf276e46e655342b92c3f2e1d417618d6b4 | |
| parent | 4af0a613637825fc06110c55dfb94215a77913d4 [diff] | |
| parent | 0f3859faae266700f701863d0f5bbba2808b7171 [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: eff2f722c3 -s ours am: 1aed8c177a -s ours am: 0f3859faae -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: If9b282d05e77319c307f98fe8fee084e25e891dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>