| commit | 65daf3cf9142a540f0e65d85b703a70f3b1eee50 | [log] [tgz] |
|---|---|---|
| author | Matías Hernández <matiashe@google.com> | Fri Apr 05 09:28:54 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Apr 05 09:28:54 2024 +0000 |
| tree | f4721f0fb90ec2e4a4fef59f98b3c55012b451dd | |
| parent | e32161d43e46e2776e8291b00006f51cc0597e24 [diff] | |
| parent | 81f8087a1aa7191ea7ba2b2c600aae96385d3d5c [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 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: I2c2cfa1bcaba1651bf5eadefb5aff1dda3a95b06 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>